diff options
| author | Björn Jacke <bj@sernet.de> | 2010-09-21 10:52:46 -0700 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2010-09-21 10:54:37 -0700 |
| commit | 81d257e8aef096c4f6ef79d20543aaf287dc9e1a (patch) | |
| tree | 554d6bd04882daaa4333a3028343b099c3a513f1 | |
| parent | aa57fd8224a09f26a0f6127024fe739b84eadf49 (diff) | |
| download | samba-81d257e8aef096c4f6ef79d20543aaf287dc9e1a.tar.gz samba-81d257e8aef096c4f6ef79d20543aaf287dc9e1a.tar.bz2 samba-81d257e8aef096c4f6ef79d20543aaf287dc9e1a.zip | |
s3: don't build krb5 locator plugin if we don't build winbind
this fixes bug #7329
| -rw-r--r-- | source3/configure.in | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/source3/configure.in b/source3/configure.in index 83db9e1394..7929be8004 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3705,18 +3705,6 @@ if test x"$with_ads_support" != x"no"; then CPPFLAGS=$ac_save_CPPFLAGS LDFLAGS=$ac_save_LDFLAGS fi - AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [], -[[#ifdef HAVE_KRB5_H - #include <krb5.h> - #endif -]]) - - if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then - WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT" - if test x"$BLDSHARED" = x"true" ; then - EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR" - fi - fi # check for new heimdal KRB5_DEPRECATED handling @@ -6266,6 +6254,20 @@ if test x"$HAVE_WINBIND" = x"yes"; then INSTALL_PAM_MODULES="installpammodules" UNINSTALL_PAM_MODULES="uninstallpammodules" fi + + # we use winbind, check for krb5 locate_plugin support: + AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [], + [[#ifdef HAVE_KRB5_H + #include <krb5.h> + #endif + ]]) + if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then + WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT" + if test x"$BLDSHARED" = x"true" ; then + EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR" + fi + fi + # end of krb5 locate_plugin check else AC_MSG_RESULT(no$winbind_no_reason) fi |