[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  81d257e s3: don't build krb5 locator plugin if we don't build winbind
      from  aa57fd8 s4-ldap: Fixed a problem with NC's having a parentGUID attribute

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 81d257e8aef096c4f6ef79d20543aaf287dc9e1a
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 21 10:52:46 2010 -0700

    s3: don't build krb5 locator plugin if we don't build winbind
    
    this fixes bug #7329

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 83db9e1..7929be8 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


-- 
Samba Shared Repository