summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-09-17 06:11:51 +0000
committerTim Potter <tpot@samba.org>2002-09-17 06:11:51 +0000
commitbd875704bff09cf0d90785575b74ae240cac0e48 (patch)
treed19626737f4cfc099ec4d0d4f83b3d00b1597c63
parent1d641866aaa36b6ecb797a248e6fb70c0241e4a9 (diff)
downloadsamba-bd875704bff09cf0d90785575b74ae240cac0e48.tar.gz
samba-bd875704bff09cf0d90785575b74ae240cac0e48.tar.bz2
samba-bd875704bff09cf0d90785575b74ae240cac0e48.zip
Added --with-ldap (default=yes) option. We should now be able to
compile a non-ADS, non-LDAP version of Samba on a machine with Kerberos and LDAP libraries installed. This shouldn't break anything - let's keep an eye on the build farm just in case. (This used to be commit b9460e79a13ab74a5fc05a9db1b5cf4d402fb197)
-rw-r--r--source3/configure.in35
1 files changed, 27 insertions, 8 deletions
diff --git a/source3/configure.in b/source3/configure.in
index fe697e4209..ef25ba4fed 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2016,15 +2016,33 @@ if test x"$with_ads_support" = x"yes"; then
AC_DEFINE(HAVE_GSSAPI)])
fi
-##################################################################
-# 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, [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, [LIBS="$LIBS -lldap";
+# Compile with LDAP support?
+
+with_ldap_support=yes
+AC_MSG_CHECKING([whether to use LDAP])
+
+AC_ARG_WITH(ldap,
+[ --with-ldap LDAP support (default yes)],
+[ case "$withval" in
+ no)
+ with_ldap_support=no
+ ;;
+ esac ])
+
+AC_MSG_RESULT($with_ldap_support)
+
+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, [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, [LIBS="$LIBS -lldap";
AC_DEFINE(HAVE_LDAP)])
########################################################
@@ -2036,6 +2054,7 @@ AC_CHECK_LIB(ldap, ldap_domain2hostlist, [LIBS="$LIBS -lldap";
#include <lber.h>
#include <ldap.h>], [ldap_set_rebind_proc(0, 0, 0);], [pam_ldap_cv_ldap_set_rebind_proc=3], [pam_ldap_cv_ldap_set_rebind_proc=2]) ])
AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $pam_ldap_cv_ldap_set_rebind_proc)
+ fi
fi
#################################################