Remove LDAP_LIBS and just use LIBS again as before. I'll

fix this better later.
(This used to be commit c6807d20457325012c4c9edd137b2f1f67e98ec4)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 53f4fad9d2cda024431125eb08c21224a0d0fbaa..4e02eb8317793ddb0c6e6bff3ed9bd69db6427f3 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -987,7 +987,7 @@ bin/mysql.@SHLIBEXT@: $(MYSQL_OBJ)
 
 bin/ldapsam.@SHLIBEXT@: passdb/pdb_ldap.o
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ @LDAP_LIBS@ passdb/pdb_ldap.o \
+       @$(SHLD) $(LDSHFLAGS) -o $@ passdb/pdb_ldap.o \
                @SONAMEFLAG@`basename $@`
 
 bin/tdbsam.@SHLIBEXT@: passdb/pdb_tdb.o

diff --git a/source3/configure.in b/source3/configure.in
index 999bd3c5f5f57de0b277ad83a5ac4baa3294b0c5..82e4b9a50d0949726e940c881f9476e2452cfa0b 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2247,12 +2247,12 @@ if test x"$with_ldap_support" = x"yes"; then
   ##################################################################
   # we might need the lber lib on some systems. To avoid link errors
   # this test must be before the libldap test
-  AC_CHECK_LIB(lber, ber_scanf, [LDAP_LIBS="$LDAP_LIBS -llber"])
+  AC_CHECK_LIB(lber, ber_scanf, [LIBS="$LIBS -llber"])
 
   ########################################################
   # now see if we can find the ldap libs in standard paths
   if test x$have_ldap != xyes; then
-  AC_CHECK_LIB(ldap, ldap_domain2hostlist, [LDAP_LIBS="$LDAP_LIBS -lldap";
+  AC_CHECK_LIB(ldap, ldap_domain2hostlist, [LIBS="$LIBS -lldap";
        AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])])
        AC_CHECK_HEADERS([ldap.h lber.h], [default_modules="$default_modules pdb_ldap"])
 
@@ -2267,13 +2267,8 @@ if test x"$with_ldap_support" = x"yes"; then
        AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $pam_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc])
   fi
   
-       if test x"$with_ads_support" = x"yes"; then
-               LIBS="$LIBS $LDAP_LIBS"
-       fi
 fi
 
-AC_SUBST(LDAP_LIBS)
-
 ########################################################
 # Compile with MySQL support?
 AM_PATH_MYSQL([0.11.0],[default_modules="$default_modules pdb_mysql"],[])