From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Tue, 7 Oct 2008 10:20:21 +0000 (-0600)
Subject: Fix: cfgaux/configure failed for helpers/negotiate_auth/squid_kerb_auth
X-Git-Tag: SQUID_3_2_0_1~1430
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2846a1ff4e9589eb49a718be35a84c3bacd3e1a5;p=thirdparty%2Fsquid.git

Fix: cfgaux/configure failed for helpers/negotiate_auth/squid_kerb_auth

Turns out that it needed to be added to the bootstrap system as well
as made a sub-configure.

Also move sub-configure to only occure when the helper needs to be built.
There is no need to waste time configuring dead code.
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 62175dce71..37332090c2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -108,7 +108,8 @@ echo "libtool  : $ltver"
 
 for dir in \
 	"" \
-	lib/libTrie
+	lib/libTrie \
+	helpers/negotiate_auth/squid_kerb_auth
 do
     if [ -z "$dir" ] || [ -d $dir ]; then
 	if (
diff --git a/configure.in b/configure.in
index 162dd23042..bd07b3a7cc 100755
--- a/configure.in
+++ b/configure.in
@@ -1593,6 +1593,11 @@ if test "$NEGOTIATE_AUTH_HELPERS" = "all" ; then
 	    if test -f $dir/config.test && sh $dir/config.test "$@";  then
 		NEGOTIATE_AUTH_HELPERS="$NEGOTIATE_AUTH_HELPERS $helper"
 	    fi
+	    # Kerberos helper has its own configure system
+	    if test "$dir" = "$srcdir/helpers/negotiate_auth/squid_kerb_auth" ; then
+	        NEGOTIATE_AUTH_HELPERS="$NEGOTIATE_AUTH_HELPERS $helper"
+		AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
+	    fi
 	done
 fi
 if test -n "$NEGOTIATE_AUTH_HELPERS"; then
@@ -3773,7 +3778,4 @@ AC_CONFIG_SUBDIRS(lib/libTrie)
 # must configure libltdl subdir unconditionally for "make distcheck" to work
 AC_CONFIG_SUBDIRS(lib/libLtdl)
 
-# Kerberos Helper has its own auto-tools system
-AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
-
 AC_OUTPUT