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 62175dce7158785bfea091db30f6c18ef39a43a9..37332090c24220cf312d86d74f2be755bf59f2a9 100755 (executable)
--- 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 162dd23042dda59a2d9a986b3707dbc7d32d5ab0..bd07b3a7ccadf4f665186b80c94c8dc2f2189dca 100755 (executable)
--- 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