Fix building on platforms without ldap

(This used to be commit 3f78ea7d06ae911f97c0a1a451e67fe00547e873)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index fa94c582e0e6978d29daac6c1570f680ca7fa32a..70591df2bdaa65b76a11ad2bd6b2ca7279a49bc2 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -275,7 +275,7 @@ PASSDB_GET_SET_OBJ = passdb/pdb_get_set.o
 
 PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
                passdb/machine_sid.o passdb/util_sam_sid.o passdb/pdb_compat.o \
-               passdb/privileges.o lib/ldap.o @PDB_STATIC@
+               passdb/privileges.o @LDAP_OBJ@ @PDB_STATIC@
 
 XML_OBJ = modules/xml.o
 MYSQL_OBJ = modules/mysql.o
@@ -598,8 +598,7 @@ WINBINDD_OBJ = \
                $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
                $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(RPC_PARSE_OBJ) \
                $(PROFILE_OBJ) $(UNIGRP_OBJ) $(IDMAP_OBJ) \
-               $(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
-               lib/ldap.o
+               $(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) @LDAP_OBJ@
 
 WBINFO_OBJ = nsswitch/wbinfo.o libsmb/smbencrypt.o libsmb/smbdes.o $(POPT_LIB_OBJ)
 

diff --git a/source3/configure.in b/source3/configure.in
index 05a819779ee74046a4886c5f5d5099d7be5c5bac..b9e32d62089f12bc5b0be52430690d5161939f43 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -157,6 +157,7 @@ AC_SUBST(ADSLIBS)
 AC_SUBST(PASSDBLIBS)
 AC_SUBST(KRB5_LIBS)
 AC_SUBST(LDAP_LIBS)
+AC_SUBST(LDAP_OBJ)
 AC_SUBST(SHLIB_PROGS)
 AC_SUBST(SMBWRAPPER)
 AC_SUBST(EXTRA_BIN_PROGS)
@@ -2246,6 +2247,7 @@ fi
 ########################################################
 # Compile with LDAP support?
 
+LDAP_OBJ=""
 with_ldap_support=yes
 AC_MSG_CHECKING([whether to use LDAP])
 
@@ -2272,6 +2274,7 @@ 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_domain2hostlist, [LIBS="$LIBS -lldap";
+       LDAP_OBJ=lib/ldap.o;
        AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])])
        AC_CHECK_HEADERS([ldap.h lber.h], [default_static_modules="$default_static_modules pdb_ldap"])