Henrik Nordstrom wrote:
> tis 2008-12-09 klockan 15:55 +1300 skrev Amos Jeffries:
>
>> I believe this is due to the commit you made an hour before reporting this
>> (at 2.11am) which added squid_kerb_auth/Makefile to the list of files
>> generated by squid/configure.
>> That makefile should only be created/altered by squid_kerb_auth/configure
>
> Hmm.. how does squid_kerb_auth get included in make dist?
The patch I mentioned Guido adding to the nt branch (below) was one I
tried myself during the merge. It results in all make targets being
replicated down into squid_kerb_auth with squid settings, regardless of
that sub-packages own configure system.
Fix make dist error
Index: configure.in
===================================================================
RCS file: /cvsroot/squid/squid3/configure.in,v
retrieving revision 1.26.2.159
retrieving revision 1.26.2.160
diff -C2 -d -r1.26.2.159 -r1.26.2.160
*** configure.in 8 Dec 2008 08:10:15 -0000 1.26.2.159
--- configure.in 8 Dec 2008 13:11:36 -0000 1.26.2.160
***************
*** 3861,3864 ****
--- 3861,3865 ----
helpers/negotiate_auth/Makefile \
helpers/negotiate_auth/mswin_sspi/Makefile \
+ helpers/negotiate_auth/squid_kerb_auth/Makefile \
helpers/external_acl/Makefile \
helpers/external_acl/ip_user/Makefile \
When configure actually does this:
...
if test -f $dir/config.test && sh $dir/config.test "$@"; then
NEGOTIATE_AUTH_HELPERS="$NEGOTIATE_AUTH_HELPERS $helper"
fi
...
for helper in $NEGOTIATE_AUTH_HELPERS; do
...
if test "$helper" = "squid_kerb_auth"; then
AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
else
...
I'm thinking it maybe was a mistake to shortcut the configure timing by
making the sub-configure optional.
Amos
-- Please be using Current Stable Squid 2.7.STABLE5 or 3.0.STABLE10 Current Beta Squid 3.1.0.3 or 3.0.STABLE11-RC1Received on Tue Dec 09 2008 - 10:39:15 MST
This archive was generated by hypermail 2.2.0 : Wed Dec 10 2008 - 12:00:02 MST