]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Properly fix squid_kerb_auth configure recursion
authorHenrik Nordstrom <henrik@henriknordstrom.net>
Wed, 8 Oct 2008 22:39:31 +0000 (00:39 +0200)
committerHenrik Nordstrom <henrik@henriknordstrom.net>
Wed, 8 Oct 2008 22:39:31 +0000 (00:39 +0200)
configure.in

index bd07b3a7ccadf4f665186b80c94c8dc2f2189dca..da7cd74555297700b7f513419f9d13a0aea22833 100755 (executable)
@@ -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