Index: configure.in
===================================================================
RCS file: /data/cvs/samba/source/configure.in,v
retrieving revision 1.300.2.112
diff -c -u -r1.300.2.112 configure.in
cvs server: conflicting specifications of output style
--- configure.in	26 Jun 2003 17:33:58 -0000	1.300.2.112
+++ configure.in	27 Jun 2003 02:23:43 -0000
@@ -2386,26 +2386,24 @@
 
 SMBLDAP=""
 if test x"$with_ldap_support" = x"yes"; then
-  ac_save_LIBS="$LIBS"
-  LIBS=""
 
   ##################################################################
   # 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)
+  AC_CHECK_LIB(lber, ber_scanf, [LDAP_LIBS="$LDAP_LIBS -llber"], [], [$LDAP_LIBS])
 
   ########################################################
   # now see if we can find the ldap libs in standard paths
   if test x$have_ldap != xyes; then
-        AC_CHECK_LIB(ldap, ldap_init, [
-           LIBS="$LIBS -lldap";
-           AC_CHECK_LIB(ldap, ldap_domain2hostlist, [
+        AC_CHECK_LIB(ldap, ldap_init, 
+           [LDAP_LIBS="$LDAP_LIBS -lldap";
+            AC_CHECK_LIB(ldap, ldap_domain2hostlist, [
 	      AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
 	      AC_CHECK_HEADERS([ldap.h lber.h], 
                  [default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
                   SMBLDAP="lib/smbldap.o"])
-           ])
-        ])
+            ], [], [$LDAP_LIBS])
+        ], [], [$LDAP_LIBS])
 
 	########################################################
 	# If we have LDAP, does it's rebind procedure take 2 or 3 arguments?
@@ -2420,8 +2418,6 @@
   fi
   
   AC_SUBST(SMBLDAP)
-  LDAP_LIBS="$LIBS";
-  LIBS="$ac_save_LIBS";
 else
     # Can't have ADS support without LDAP
     if test x"$with_ads_support" = x"yes"; then