From: Howard Chu Date: Fri, 21 Jun 2002 01:34:53 +0000 (+0000) Subject: Fix dynamic module linking X-Git-Tag: NO_SLAP_OP_BLOCKS~1401 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7e8c77c5deb379bf3d24329cc03158e7b63d7aed;p=openldap Fix dynamic module linking --- diff --git a/servers/slapd/back-bdb/Makefile.in b/servers/slapd/back-bdb/Makefile.in index e2208232da..e7ecee8691 100644 --- 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 50abb23faf..9b038fabfc 100644 --- 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 aadb93643c..2ce5a7fef3 100644 --- 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 b2bb0f7c9c..cf7924a609 100644 --- 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 c6e1e7d6bc..da325d42a3 100644 --- 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 e80385288a..f75e86a6cc 100644 --- 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 447ebd4269..b231736f7a 100644 --- 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 dd0b30d286..79594a454c 100644 --- 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 0fec87230d..b739bf2e2a 100644 --- 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 5406620160..d518024ec1 100644 --- 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 7cf2b2e494..e53ce76f85 100644 --- 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