From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Wed, 8 Oct 2008 22:39:31 +0000 (+0200)
Subject: Properly fix squid_kerb_auth configure recursion
X-Git-Tag: SQUID_3_2_0_1~1426
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb336aa2d8787a81bd53b7e75a1a878a29c68f15;p=thirdparty%2Fsquid.git

Properly fix squid_kerb_auth configure recursion
---

diff --git a/configure.in b/configure.in
index bd07b3a7cc..da7cd74555 100755
--- a/configure.in
+++ b/configure.in
@@ -1593,11 +1593,6 @@ 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
@@ -1607,6 +1602,15 @@ if test -n "$NEGOTIATE_AUTH_HELPERS"; then
 	else
 	    AC_MSG_ERROR(Negotiate Auth helper $helper does not exist)
 	fi
+	# Kerberos helper has its own configure system
+	if test "$srcdir/helpers/negotiate_auth/$helper/configure" ; then
+	    if test $helper = squid_kerb_auth; then
+		AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
+	    else
+		echo "ERROR: configure.in needs to be extended to support $helper!"
+		exit 1
+	    fi
+	fi
     done
     echo "Negotiate auth helpers built: $NEGOTIATE_AUTH_HELPERS"
 fi