From 81d257e8aef096c4f6ef79d20543aaf287dc9e1a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
Date: Tue, 21 Sep 2010 10:52:46 -0700
Subject: [PATCH] s3: don't build krb5 locator plugin if we don't build winbind

this fixes bug #7329
---
 source3/configure.in | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

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