Fix dynamic module linking

diff --git a/servers/slapd/back-bdb/Makefile.in b/servers/slapd/back-bdb/Makefile.in
index e2208232dae7a601a0f9ebe8cdf56dbb145935e9..e7ecee86916d4eeda8064b037575b8f9935067ef 100644 (file)
--- a/servers/slapd/back-bdb/Makefile.in
+++ b/servers/slapd/back-bdb/Makefile.in
@@ -21,8 +21,9 @@ BUILD_MOD_DYNAMIC = @BUILD_BDB_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_BDB@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_bdb
 

diff --git a/servers/slapd/back-dnssrv/Makefile.in b/servers/slapd/back-dnssrv/Makefile.in
index 50abb23faf8548058bc29009fce8d6c86bd43e34..9b038fabfc86a0602cd19e751d688fbf76d40458 100644 (file)
--- a/servers/slapd/back-dnssrv/Makefile.in
+++ b/servers/slapd/back-dnssrv/Makefile.in
@@ -23,8 +23,9 @@ BUILD_MOD_DYNAMIC = @BUILD_DNSSRV_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_DNSSRV@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_dnssrv
 

diff --git a/servers/slapd/back-ldap/Makefile.in b/servers/slapd/back-ldap/Makefile.in
index aadb93643c0f57cd0783144f1435579ebdf51d0b..2ce5a7fef38900695bd7d9701936421d73a69401 100644 (file)
--- a/servers/slapd/back-ldap/Makefile.in
+++ b/servers/slapd/back-ldap/Makefile.in
@@ -17,8 +17,9 @@ BUILD_MOD_DYNAMIC = @BUILD_LDAP_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_LDAP@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_ldap
 

diff --git a/servers/slapd/back-ldbm/Makefile.in b/servers/slapd/back-ldbm/Makefile.in
index b2bb0f7c9c161bae90d1f85872c6771881c95098..cf7924a60984da50b9c3b369194793591f360d26 100644 (file)
--- a/servers/slapd/back-ldbm/Makefile.in
+++ b/servers/slapd/back-ldbm/Makefile.in
@@ -23,8 +23,9 @@ BUILD_MOD_DYNAMIC = @BUILD_LDBM_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_LDBM@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_ldbm
 

diff --git a/servers/slapd/back-meta/Makefile.in b/servers/slapd/back-meta/Makefile.in
index c6e1e7d6bcd04e939928e201ae6c1574589298ae..da325d42a3b5c9e49611fcb09b06bb8f80bb2939 100644 (file)
--- a/servers/slapd/back-meta/Makefile.in
+++ b/servers/slapd/back-meta/Makefile.in
@@ -17,8 +17,9 @@ BUILD_MOD_DYNAMIC = @BUILD_META_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_META@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_meta
 

diff --git a/servers/slapd/back-monitor/Makefile.in b/servers/slapd/back-monitor/Makefile.in
index e80385288ad89df7fcd578e203792f3ffbb837f4..f75e86a6ccc2ae2775735550f6a01032f7e47609 100644 (file)
--- a/servers/slapd/back-monitor/Makefile.in
+++ b/servers/slapd/back-monitor/Makefile.in
@@ -21,8 +21,9 @@ BUILD_MOD_DYNAMIC = @BUILD_MONITOR_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_MONITOR@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_monitor
 

diff --git a/servers/slapd/back-passwd/Makefile.in b/servers/slapd/back-passwd/Makefile.in
index 447ebd42692a134e0a9262b041cd5fe911ec4c11..b231736f7aafe307214ecf8b3b6751a3f4d4a145 100644 (file)
--- a/servers/slapd/back-passwd/Makefile.in
+++ b/servers/slapd/back-passwd/Makefile.in
@@ -13,8 +13,9 @@ BUILD_MOD_DYNAMIC = @BUILD_PASSWD_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_PASSWD@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_passwd
 

diff --git a/servers/slapd/back-perl/Makefile.in b/servers/slapd/back-perl/Makefile.in
index dd0b30d286ecbf5a79dd2c3df77b08b6349e38a3..79594a454c57c38c0943963d465abd857cef4f76 100644 (file)
--- a/servers/slapd/back-perl/Makefile.in
+++ b/servers/slapd/back-perl/Makefile.in
@@ -26,8 +26,9 @@ PERL_CPPFLAGS = @PERL_CPPFLAGS@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_PERL@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_perl
 

diff --git a/servers/slapd/back-shell/Makefile.in b/servers/slapd/back-shell/Makefile.in
index 0fec87230d05d04d5ee0164aad46e2de490e8134..b739bf2e2afe6cb6d8534bacfc337b7fd873083c 100644 (file)
--- a/servers/slapd/back-shell/Makefile.in
+++ b/servers/slapd/back-shell/Makefile.in
@@ -17,8 +17,9 @@ BUILD_MOD_DYNAMIC = @BUILD_SHELL_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_SHELL@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_shell
 

diff --git a/servers/slapd/back-sql/Makefile.in b/servers/slapd/back-sql/Makefile.in
index 5406620160b6a3e9cd4c3099115ae3326daed037..d518024ec169dc159460c74bf0ab4854193339b0 100644 (file)
--- a/servers/slapd/back-sql/Makefile.in
+++ b/servers/slapd/back-sql/Makefile.in
@@ -15,8 +15,9 @@ BUILD_MOD_DYNAMIC = @BUILD_SQL_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_SQL@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_sql
 

diff --git a/servers/slapd/back-tcl/Makefile.in b/servers/slapd/back-tcl/Makefile.in
index 7cf2b2e4949ea7f332ba90e6b1327bd58bff98d3..e53ce76f85b778a40b429f9e23c7c43e7d222579 100644 (file)
--- a/servers/slapd/back-tcl/Makefile.in
+++ b/servers/slapd/back-tcl/Makefile.in
@@ -29,8 +29,9 @@ BUILD_MOD_DYNAMIC = @BUILD_TCL_DYNAMIC@
 mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_TCL@_DEFS)
 
-shared_LDAP_LIBS = $(LDAP_LIBPATH) -lldap_r -llber
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_tcl