diff options
| author | James Peach <jpeach@samba.org> | 2006-04-11 23:32:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:59 -0500 |
| commit | a407405438beb1f71e186d7e5b2145b303ccfdaf (patch) | |
| tree | 2fdc76b0a5cd66840256f106421a84349fe13c37 | |
| parent | 3f2b06d614c7bb9cd2699f0e380a8b3e9e08137f (diff) | |
| download | samba-a407405438beb1f71e186d7e5b2145b303ccfdaf.tar.gz samba-a407405438beb1f71e186d7e5b2145b303ccfdaf.tar.bz2 samba-a407405438beb1f71e186d7e5b2145b303ccfdaf.zip | |
r15046: 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.
(This used to be commit 1d5e4830d33906da433655ecaf87300ed874b06f)
| -rw-r--r-- | source3/configure.in | 58 |
1 files changed, 34 insertions, 24 deletions
diff --git a/source3/configure.in b/source3/configure.in index 1aa4adf4f0..b6a7556166 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3126,42 +3126,52 @@ FOUND_KRB5=no 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 |