diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-04-06 01:08:39 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-04-06 01:08:39 +0000 |
| commit | 35833e5aaf1ccf5c606e26eabe2fee8e4fb9f523 (patch) | |
| tree | d33374abd4a1f82cc9927dabfd909e5975d77b1a /source3 | |
| parent | d164bb1772e6c4b1761bea86dc4b8f0940764995 (diff) | |
| download | samba-35833e5aaf1ccf5c606e26eabe2fee8e4fb9f523.tar.gz samba-35833e5aaf1ccf5c606e26eabe2fee8e4fb9f523.tar.bz2 samba-35833e5aaf1ccf5c606e26eabe2fee8e4fb9f523.zip | |
Fix building on platforms without ldap
(This used to be commit 3f78ea7d06ae911f97c0a1a451e67fe00547e873)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 5 | ||||
| -rw-r--r-- | source3/configure.in | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index fa94c582e0..70591df2bd 100644 --- 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 05a819779e..b9e32d6208 100644 --- 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"]) |