ITS#9235 Merge libldap_r into libldap

.gitignore

@@ -68,76 +68,6 @@ Makefile
 /include/ldap_features.h
 /include/portable.h
 libraries/libl*/*test
-libraries/libldap_r/abandon.c
-libraries/libldap_r/add.c
-libraries/libldap_r/addentry.c
-libraries/libldap_r/apitest
-libraries/libldap_r/apitest.c
-libraries/libldap_r/assertion.c
-libraries/libldap_r/bind.c
-libraries/libldap_r/cancel.c
-libraries/libldap_r/charray.c
-libraries/libldap_r/compare.c
-libraries/libldap_r/controls.c
-libraries/libldap_r/cyrus.c
-libraries/libldap_r/dds.c
-libraries/libldap_r/delete.c
-libraries/libldap_r/deref.c
-libraries/libldap_r/dnssrv.c
-libraries/libldap_r/error.c
-libraries/libldap_r/extended.c
-libraries/libldap_r/fetch.c
-libraries/libldap_r/filter.c
-libraries/libldap_r/free.c
-libraries/libldap_r/getattr.c
-libraries/libldap_r/getdn.c
-libraries/libldap_r/getentry.c
-libraries/libldap_r/getvalues.c
-libraries/libldap_r/init.c
-libraries/libldap_r/lbase64.c
-libraries/libldap_r/ldap_sync.c
-libraries/libldap_r/ldif.c
-libraries/libldap_r/ldifutil.c
-libraries/libldap_r/ltest
-libraries/libldap_r/messages.c
-libraries/libldap_r/modify.c
-libraries/libldap_r/modrdn.c
-libraries/libldap_r/msctrl.c
-libraries/libldap_r/open.c
-libraries/libldap_r/options.c
-libraries/libldap_r/os-ip.c
-libraries/libldap_r/os-local.c
-libraries/libldap_r/pagectrl.c
-libraries/libldap_r/passwd.c
-libraries/libldap_r/ppolicy.c
-libraries/libldap_r/print.c
-libraries/libldap_r/psearchctrl.c
-libraries/libldap_r/references.c
-libraries/libldap_r/request.c
-libraries/libldap_r/result.c
-libraries/libldap_r/sasl.c
-libraries/libldap_r/sbind.c
-libraries/libldap_r/schema.c
-libraries/libldap_r/search.c
-libraries/libldap_r/sort.c
-libraries/libldap_r/sortctrl.c
-libraries/libldap_r/stctrl.c
-libraries/libldap_r/string.c
-libraries/libldap_r/test.c
-libraries/libldap_r/tls2.c
-libraries/libldap_r/tls_g.c
-libraries/libldap_r/tls_m.c
-libraries/libldap_r/tls_o.c
-libraries/libldap_r/turn.c
-libraries/libldap_r/txn.c
-libraries/libldap_r/unbind.c
-libraries/libldap_r/url.c
-libraries/libldap_r/utf-8-conv.c
-libraries/libldap_r/utf-8.c
-libraries/libldap_r/util-int.c
-libraries/libldap_r/vc.c
-libraries/libldap_r/vlvctrl.c
-libraries/libldap_r/whoami.c
 libraries/liblunicode/ucdata.c
 libraries/liblunicode/ucdata.h
 libraries/liblunicode/ucgendat

build/top.mk

@@ -166,7 +166,6 @@ WT_LIBS = @WT_LIBS@
 
 LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
 LDAP_LIBLDAP_LA = $(LDAP_LIBDIR)/libldap/libldap.la
-LDAP_LIBLDAP_R_LA = $(LDAP_LIBDIR)/libldap_r/libldap_r.la
 
 LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a
 LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a
@@ -175,7 +174,7 @@ LDAP_LIBLUTIL_A = $(LDAP_LIBDIR)/liblutil/liblutil.a
 LDAP_L = $(LDAP_LIBLUTIL_A) \
 	$(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
 SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \
-	$(LDAP_LIBLUTIL_A) $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+	$(LDAP_LIBLUTIL_A) $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
 
 WRAP_LIBS = @WRAP_LIBS@
 # AutoConfig generated 

configure.in

@@ -3079,7 +3079,6 @@ AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk]
 [libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.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/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk]
 [libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk]
 [libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk]

contrib/slapd-modules/acl/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/addpartial/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/adremap/Makefile

@@ -13,7 +13,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/allop/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/allowed/Makefile

@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/authzid/Makefile

@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/autogroup/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/cloak/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/comp_match/Makefile

@@ -18,7 +18,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 SNACC_DIR = ../$(LDAP_SRC)/snacc

contrib/slapd-modules/denyop/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/dsaschema/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/dupent/Makefile

@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/kinit/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/lastbind/Makefile

@@ -13,7 +13,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/lastmod/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/noopsrch/Makefile

@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool

contrib/slapd-modules/nops/Makefile

@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
 	$(LDAP_BUILD)/libraries/liblber/liblber.la
 
 LIBTOOL = $(LDAP_BUILD)/libtool