Add -lldap_r build environment (no code yet).

diff --git a/configure b/configure
index 4d4ea066423860f860bebcedf473ef046500f42c..31c55b2c5edd46c3cdca53843a3a30e5ba11bef3 100755 (executable)
--- a/configure
+++ b/configure
@@ -8246,6 +8246,7 @@ libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk        \
 libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk   \
 libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk \
 libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk \
+libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk     \
 libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk \
 libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \
 libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk:build/lib-static.mk   \
@@ -8397,6 +8398,7 @@ libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk        \
 libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk   \
 libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk \
 libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk \
+libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk     \
 libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk \
 libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \
 libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk:build/lib-static.mk   \

diff --git a/configure.in b/configure.in
index 5ebcf71b851f23cc0be1604786d579b535c5c918..d7de1b6f206c923ebc52b15ca289a616521403be 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1272,6 +1272,7 @@ libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk        \
 libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk   \
 libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk \
 libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk \
+libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk     \
 libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk \
 libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \
 libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk:build/lib-static.mk   \

diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index 49f47807d0beaa7461ccced7c356c1af91b654c1..7caec1da3d5a5267c16d1c6dc9dc76ad99bd1220 100644 (file)
--- a/libraries/Makefile.in
+++ b/libraries/Makefile.in
@@ -3,5 +3,6 @@
 ##
 ## Libraries Makefile for OpenLDAP
 
-SUBDIRS= libavl liblber libldap libldif libldbm liblthread liblutil
+SUBDIRS= libavl liblber libldap libldif libldbm liblthread \
+       liblutil libldap_r
 

diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
new file mode 100644 (file)
index 0000000..9706efb
--- /dev/null
+++ b/libraries/libldap_r/Makefile.in
@@ -0,0 +1,71 @@
+##
+## Makefile.in for LDAP -lldap
+##
+LIBRARY = libldap_r.la
+XLIBRARY = ../libldap_r.a
+
+XDIR = ../libldap
+XDEFS = -DLDAP_THREAD_SAFE -I$(XDIR)
+
+PROGRAMS = apitest ltest ttest
+
+XSRCS  = apitest.c test.c tmpltest.c \
+       bind.c open.c result.c error.c compare.c search.c \
+       modify.c add.c modrdn.c delete.c abandon.c ufn.c cache.c \
+       getfilter.c sbind.c kbind.c unbind.c friendly.c cldap.c \
+       free.c disptmpl.c srchpref.c dsparse.c tmplout.c sort.c \
+       getdn.c getentry.c getattr.c getvalues.c addentry.c \
+       request.c getdxbyname.c os-ip.c url.c charset.c \
+       init.c options.c strdup.c util-int.c
+OBJS   = bind.lo open.lo result.lo error.lo compare.lo search.lo \
+       modify.lo add.lo modrdn.lo delete.lo abandon.lo ufn.lo cache.lo \
+       getfilter.lo sbind.lo kbind.lo unbind.lo friendly.lo cldap.lo \
+       free.lo disptmpl.lo srchpref.lo dsparse.lo tmplout.lo sort.lo \
+       getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
+       request.lo getdxbyname.lo os-ip.lo url.lo charset.lo \
+       init.lo options.lo strdup.lo util-int.lo
+
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+
+LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) $(AC_LIBS)
+
+.links :
+       @for i in $(XSRCS); do \
+               $(RM) $$i ; \
+               $(LN_S) $(XDIR)/$$i . ; \
+       done
+       touch .links
+
+$(XSRCS) : .links
+
+clean-local: FORCE
+       $(RM) .links
+
+apitest:       $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
+       $(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)
+ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
+       $(LTLINK) $(LDFLAGS) -o $@ test.o $(LIBS)
+ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
+       $(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
+
+CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
+
+install-local: $(CFFILES) FORCE
+       -$(MKDIR) $(libdir)
+       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
+       -$(MKDIR) $(sysconfdir)
+       @for i in $(CFFILES); do \
+               if test ! -f $(sysconfdir)/$$i; then \
+                       echo "installing $$i in $(sysconfdir)"; \
+                       echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i"; \
+                       $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i; \
+               else \
+                       echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
+               fi; \
+               $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i.default; \
+       done
+       -$(MKDIR) $(datadir)
+       -$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly-
+       $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(datadir)/ldapfriendly
+

diff --git a/libraries/libldap_r/Version.c b/libraries/libldap_r/Version.c
new file mode 100644 (file)
index 0000000..a827b33
--- /dev/null
+++ b/libraries/libldap_r/Version.c
@@ -0,0 +1,5 @@
+/*
+ * Reentrant version of -lldap
+ */
+
+static char Version[] = "  libldap_r.a v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";