svn commit: samba r15046 - branches/SAMBA_3_0/source trunk/source
jpeach at samba.org
jpeach at samba.org
Tue Apr 11 23:32:06 GMT 2006
Author: jpeach
Date: 2006-04-11 23:32:04 +0000 (Tue, 11 Apr 2006)
New Revision: 15046
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15046
Log:
Fix bug #3490 reported by Jason Mader. Do not continue to check for LDAP
and AD requirements if --without-ldap and --without-ads have been given
to configure.
Modified:
branches/SAMBA_3_0/source/configure.in
trunk/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in 2006-04-11 17:04:53 UTC (rev 15045)
+++ branches/SAMBA_3_0/source/configure.in 2006-04-11 23:32:04 UTC (rev 15046)
@@ -3126,42 +3126,52 @@
KRB5_LIBS=""
if test x"$with_ldap_support" != x"yes"; then
+
if test x"$with_ads_support" = x"yes"; then
AC_MSG_ERROR(Active Directory Support requires LDAP support)
- elif test x"$with_ads_support" != x"no"; then
- AC_MSG_WARN(Active Directory Support requires LDAP support)
+ elif test x"$with_ads_support" = x"auto"; then
+ AC_MSG_WARN(Disabling Active Directory support (requires LDAP support))
+ with_ads_support=no
fi
- with_ads_support=no
-fi
-AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
+else
-if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
- if test x"$with_ads_support" = x"yes"; then
- AC_MSG_ERROR(Active Directory Support requires ldap_initialize)
+ # Check to see whether there is enough LDAP functionality to be able
+ # to build AD support.
+
+ AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
+
+ if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
+ if test x"$with_ads_support" = x"yes"; then
+ AC_MSG_ERROR(Active Directory support requires ldap_initialize)
+ elif test x"$with_ads_support" = x"auto"; then
+ AC_MSG_WARN(Disabling Active Directory support (requires ldap_initialize))
+ with_ads_support=no
+ fi
fi
- AC_MSG_WARN(Active Directory Support requires ldap_initialize)
- with_ads_support=no
-fi
-AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS)
+ AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS)
-if test x"$ac_cv_func_ext_ldap_domain2hostlist" != x"yes"; then
- if test x"$with_ads_support" = x"yes"; then
- AC_MSG_ERROR(Active Directory Support requires ldap_domain2hostlist)
+ if test x"$ac_cv_func_ext_ldap_domain2hostlist" != x"yes"; then
+ if test x"$with_ads_support" = x"yes"; then
+ AC_MSG_ERROR(Active Directory support requires ldap_domain2hostlist)
+ elif test x"$with_ads_support" = x"auto"; then
+ AC_MSG_WARN(Disabling Active Directory support (requires ldap_domain2hostlist))
+ with_ads_support=no
+ fi
fi
- AC_MSG_WARN(Active Directory Support requires ldap_domain2hostlist)
- with_ads_support=no
-fi
-AC_CHECK_FUNC_EXT(ldap_add_result_entry,$LDAP_LIBS)
+ AC_CHECK_FUNC_EXT(ldap_add_result_entry,$LDAP_LIBS)
-if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
- if test x"$with_ads_support" = x"yes"; then
- AC_MSG_ERROR(Active Directory Support requires ldap_add_result_entry)
+ if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
+ if test x"$with_ads_support" = x"yes"; then
+ AC_MSG_ERROR(Active Directory support requires ldap_add_result_entry)
+ elif test x"$with_ads_support" = x"auto"; then
+ AC_MSG_WARN(Disabling Active Directory support (requires ldap_add_result_entry))
+ with_ads_support=no
+ fi
fi
- AC_MSG_WARN(Active Directory Support requires ldap_add_result_entry)
- with_ads_support=no
+
fi
if test x"$with_ads_support" != x"no"; then
Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in 2006-04-11 17:04:53 UTC (rev 15045)
+++ trunk/source/configure.in 2006-04-11 23:32:04 UTC (rev 15046)
@@ -3126,42 +3126,52 @@
KRB5_LIBS=""
if test x"$with_ldap_support" != x"yes"; then
+
if test x"$with_ads_support" = x"yes"; then
AC_MSG_ERROR(Active Directory Support requires LDAP support)
- elif test x"$with_ads_support" != x"no"; then
- AC_MSG_WARN(Active Directory Support requires LDAP support)
+ elif test x"$with_ads_support" = x"auto"; then
+ AC_MSG_WARN(Disabling Active Directory support (requires LDAP support))
+ with_ads_support=no
fi
- with_ads_support=no
-fi
-AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
+else
-if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
- if test x"$with_ads_support" = x"yes"; then
- AC_MSG_ERROR(Active Directory Support requires ldap_initialize)
+ # Check to see whether there is enough LDAP functionality to be able
+ # to build AD support.
+
+ AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
+
+ if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
+ if test x"$with_ads_support" = x"yes"; then
+ AC_MSG_ERROR(Active Directory support requires ldap_initialize)
+ elif test x"$with_ads_support" = x"auto"; then
+ AC_MSG_WARN(Disabling Active Directory support (requires ldap_initialize))
+ with_ads_support=no
+ fi
fi
- AC_MSG_WARN(Active Directory Support requires ldap_initialize)
- with_ads_support=no
-fi
-AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS)
+ AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS)
-if test x"$ac_cv_func_ext_ldap_domain2hostlist" != x"yes"; then
- if test x"$with_ads_support" = x"yes"; then
- AC_MSG_ERROR(Active Directory Support requires ldap_domain2hostlist)
+ if test x"$ac_cv_func_ext_ldap_domain2hostlist" != x"yes"; then
+ if test x"$with_ads_support" = x"yes"; then
+ AC_MSG_ERROR(Active Directory support requires ldap_domain2hostlist)
+ elif test x"$with_ads_support" = x"auto"; then
+ AC_MSG_WARN(Disabling Active Directory support (requires ldap_domain2hostlist))
+ with_ads_support=no
+ fi
fi
- AC_MSG_WARN(Active Directory Support requires ldap_domain2hostlist)
- with_ads_support=no
-fi
-AC_CHECK_FUNC_EXT(ldap_add_result_entry,$LDAP_LIBS)
+ AC_CHECK_FUNC_EXT(ldap_add_result_entry,$LDAP_LIBS)
-if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
- if test x"$with_ads_support" = x"yes"; then
- AC_MSG_ERROR(Active Directory Support requires ldap_add_result_entry)
+ if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
+ if test x"$with_ads_support" = x"yes"; then
+ AC_MSG_ERROR(Active Directory support requires ldap_add_result_entry)
+ elif test x"$with_ads_support" = x"auto"; then
+ AC_MSG_WARN(Disabling Active Directory support (requires ldap_add_result_entry))
+ with_ads_support=no
+ fi
fi
- AC_MSG_WARN(Active Directory Support requires ldap_add_result_entry)
- with_ads_support=no
+
fi
if test x"$with_ads_support" != x"no"; then
More information about the samba-cvs
mailing list