fix previous commit

This commit is contained in:
Pierangelo Masarati 2002-12-07 19:19:26 +00:00
parent d19706634c
commit 08710f80cd
3 changed files with 8 additions and 2 deletions

View file

@ -579,6 +579,8 @@ TERMCAP_LIBS=
TLS_LIBS= TLS_LIBS=
MODULES_LIBS= MODULES_LIBS=
SLAPI_LIBS= SLAPI_LIBS=
LIBSLAPI=
LIBSLAPITOOLS=
AUTH_LIBS= AUTH_LIBS=
SLAPD_SLP_LIBS= SLAPD_SLP_LIBS=
@ -2524,6 +2526,8 @@ if test "$ol_enable_slapi" != no ; then
fi fi
AC_CHECK_LIB(ltdl, lt_dlinit, [ AC_CHECK_LIB(ltdl, lt_dlinit, [
SLAPI_LIBS=-lltdl SLAPI_LIBS=-lltdl
LIBSLAPI=./libslapi.a
LIBSLAPITOOLS=../libslapi.a
AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl]) AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl])
],[AC_MSG_ERROR([could not locate libtool -lltdl])]) ],[AC_MSG_ERROR([could not locate libtool -lltdl])])
@ -2878,6 +2882,8 @@ AC_SUBST(TERMCAP_LIBS)
AC_SUBST(TLS_LIBS) AC_SUBST(TLS_LIBS)
AC_SUBST(MODULES_LIBS) AC_SUBST(MODULES_LIBS)
AC_SUBST(SLAPI_LIBS) AC_SUBST(SLAPI_LIBS)
AC_SUBST(LIBSLAPI)
AC_SUBST(LIBSLAPITOOLS)
AC_SUBST(AUTH_LIBS) AC_SUBST(AUTH_LIBS)
AC_SUBST(SLAPD_SLP_LIBS) AC_SUBST(SLAPD_SLP_LIBS)

View file

@ -48,7 +48,7 @@ XLDFLAGS = $(MODULES_LDFLAGS)
XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L) XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L)
XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS) 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_OPT = "--enable-slapd"
BUILD_SRV = @BUILD_SLAPD@ BUILD_SRV = @BUILD_SLAPD@

View file

@ -28,7 +28,7 @@ XXLIBS = $(SLAPD_LIBS) \
$(LDBM_LIBS) $(SECURITY_LIBS) \ $(LDBM_LIBS) $(SECURITY_LIBS) \
$(LDIF_LIBS) $(LUTIL_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
XXXLIBS = $(MODULES_LIBS) $(LTHREAD_LIBS) \ XXXLIBS = $(MODULES_LIBS) $(LTHREAD_LIBS) \
$(SLAPI_LIBS) $(SLAPI_LIBS) @LIBSLAPITOOLS@
STATIC_DEPENDS=@SLAPD_NO_STATIC@ ../libbackends.a STATIC_DEPENDS=@SLAPD_NO_STATIC@ ../libbackends.a