From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 7 Dec 2002 19:19:26 +0000 (+0000)
Subject: fix previous commit
X-Git-Tag: NO_SLAP_OP_BLOCKS~705
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=08710f80cd4e17ed236a192e7b8ec69fb680d0fa;p=openldap

fix previous commit
---

diff --git a/configure.in b/configure.in
index 4a4eb66a0c..45a36c81a8 100644
--- a/configure.in
+++ b/configure.in
@@ -579,6 +579,8 @@ TERMCAP_LIBS=
 TLS_LIBS=
 MODULES_LIBS=
 SLAPI_LIBS=
+LIBSLAPI=
+LIBSLAPITOOLS=
 AUTH_LIBS=
 
 SLAPD_SLP_LIBS=
@@ -2524,6 +2526,8 @@ if test "$ol_enable_slapi" != no ; then
 	fi
 	AC_CHECK_LIB(ltdl, lt_dlinit, [
 		SLAPI_LIBS=-lltdl
+		LIBSLAPI=./libslapi.a
+		LIBSLAPITOOLS=../libslapi.a
 		AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl])
 	],[AC_MSG_ERROR([could not locate libtool -lltdl])])
 
@@ -2878,6 +2882,8 @@ AC_SUBST(TERMCAP_LIBS)
 AC_SUBST(TLS_LIBS)
 AC_SUBST(MODULES_LIBS)
 AC_SUBST(SLAPI_LIBS)
+AC_SUBST(LIBSLAPI)
+AC_SUBST(LIBSLAPITOOLS)
 AC_SUBST(AUTH_LIBS)
 
 AC_SUBST(SLAPD_SLP_LIBS)
diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index fc369f5ae4..41b7d66164 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -48,7 +48,7 @@ XLDFLAGS = $(MODULES_LDFLAGS)
 
 XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L)
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS) $(SLAPI_LIBS)
+XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS) $(SLAPI_LIBS) @LIBSLAPI@
 
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index f24883c732..3761208313 100644
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -28,7 +28,7 @@ XXLIBS = $(SLAPD_LIBS) \
 	$(LDBM_LIBS) $(SECURITY_LIBS) \
 	$(LDIF_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(MODULES_LIBS) $(LTHREAD_LIBS) \
-	$(SLAPI_LIBS)
+	$(SLAPI_LIBS) @LIBSLAPITOOLS@
 
 STATIC_DEPENDS=@SLAPD_NO_STATIC@ ../libbackends.a