The unified diff between revisions [812a98e1..] and [0713a548..] is displayed below. It can also be downloaded as a raw diff.
This diff has been restricted to the following files: 'configure.in'
#
#
# patch "configure.in"
# from [97beba71bff3de87f7cef0b9f9799a31f8ccc6da]
# to [96518f20028eb5dcc3750d0b9c0bef5d51c2fa7a]
#
============================================================
--- configure.in 97beba71bff3de87f7cef0b9f9799a31f8ccc6da
+++ configure.in 96518f20028eb5dcc3750d0b9c0bef5d51c2fa7a
@@ -3,15 +3,15 @@ dnl
dnl
dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
dnl
-dnl $Id: configure.in,v 1.251.2.108 2006/05/12 19:35:27 serassio Exp $
+dnl $Id: configure.in,v 1.314 2006/05/16 01:21:29 hno Exp $
dnl
dnl
dnl
AC_INIT(src/main.c)
AC_CONFIG_AUX_DIR(cfgaux)
-AM_INIT_AUTOMAKE(squid, 2.5.STABLE13-CVS)
+AM_INIT_AUTOMAKE(squid, 2.6.DEVEL-CVS)
AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.251.2.108 $)dnl
+AC_REVISION($Revision: 1.314 $)dnl
AC_PREFIX_DEFAULT(/usr/local/squid)
AM_MAINTAINER_MODE
@@ -250,6 +250,35 @@ dnl ])
dnl fi
dnl ])
+valgrind=
+AC_ARG_WITH(valgrind-debug,
+[ --with-valgrind-debug Include debug instrumentation for use with valgrind],
+[ case $withval in
+ yes)
+ valgrind=1
+ ;;
+ no)
+ valgrind=
+ ;;
+ *)
+ CPPFLAGS="$CPPFLAGS -I${enableval}/include"
+ valgrind=1
+ ;;
+ esac
+ if test $valgrind; then
+ AC_DEFINE(WITH_VALGRIND, 1, [Valgrind memory debugger support])
+ echo "Valgrind debug support enabled"
+ fi
+])
+
+valgrind=
+AC_ARG_ENABLE(mempool-debug,
+[ --enable-mempool-debug Include MemPool debug verifications])
+if test "$enable_mempool_debug" = yes; then
+ AC_DEFINE(DEBUG_MEMPOOL, 1, [MemPool debug verifications])
+ echo "Mempool debug checks enabled"
+fi
+
AC_ARG_ENABLE(xmalloc-statistics,
[ --enable-xmalloc-statistics
Show malloc statistics in status page],
@@ -472,15 +501,27 @@ AC_ARG_ENABLE(wccp,
])
AC_ARG_ENABLE(wccp,
-[ --disable-wccp Disable Web Cache Coordination Protocol],
+[ --disable-wccp Disable Web Cache Coordination V1 Protocol],
[ if test "$enableval" = "no" ; then
- echo "Web Cache Coordination Protocol disabled"
+ echo "Web Cache Coordination V1 Protocol disabled"
AC_DEFINE(USE_WCCP, 0)
else
AC_DEFINE(USE_WCCP, 1)
fi
])
+AM_CONDITIONAL(USE_WCCPv2, false)
+AC_ARG_ENABLE(wccpv2,
+[ --enable-wccpv2 Enable Web Cache Coordination V2 Protocol],
+[ if test "$enableval" = "yes" ; then
+ echo "Web Cache Coordination V2 Protocol enabled"
+ AC_DEFINE(USE_WCCPv2, 1)
+ AM_CONDITIONAL(USE_WCCPv2, true)
+ fi
+])
+
+
+
AC_ARG_ENABLE(kill-parent-hack,
[ --enable-kill-parent-hack
Kill parent on shutdown],
@@ -638,6 +679,15 @@ AC_ARG_ENABLE(cache-digests,
fi
])
+AC_ARG_ENABLE(auth-on-acceleration,
+[ --enable-auth-on-acceleration
+ Enable authentication in accelerators],
+[ if test "$enableval" = "yes" ; then
+ echo "AUTH_ON_ACCELERATION enabled"
+ AC_DEFINE(AUTH_ON_ACCELERATION)
+ fi
+])
+
dnl Select Default Error language
AC_ARG_ENABLE(default-err-language,
[ --enable-default-err-language=lang
@@ -932,7 +982,27 @@ AC_ARG_ENABLE(underscores,
fi
])
+dnl Select Default hosts file location
+AC_ARG_ENABLE(default-hostsfile,
+[ --enable-default-hostsfile=path
+ Select default location for hosts file.
+ See hosts_file directive in squid.conf for details],
+[
+ if test "$enableval" != "none" ; then
+ if test -f $enableval; then
+ OPT_DEFAULT_HOSTS=$enableval
+ else
+ echo "Warning Unable to find $enableval"
+ sleep 5
+ fi
+ else
+ OPT_DEFAULT_HOSTS="none"
+ fi
+ echo "Default hosts file set to: $enableval"
+],[OPT_DEFAULT_HOSTS="/etc/hosts"])
+AC_SUBST(OPT_DEFAULT_HOSTS)
+
dnl Select auth schemes modules to build
AC_ARG_ENABLE(auth,
[ --enable-auth=\"list of auth scheme modules\"
@@ -1841,6 +1911,7 @@ AC_CHECK_FUNCS(\
setsid \
sigaction \
snprintf \
+ socketpair \
srand48 \
srandom \
statfs \
@@ -2477,6 +2548,7 @@ AC_OUTPUT([\
src/auth/basic/Makefile \
src/auth/digest/Makefile \
src/auth/ntlm/Makefile \
+ src/auth/negotiate/Makefile \
contrib/Makefile \
snmplib/Makefile \
icons/Makefile \
@@ -2503,6 +2575,7 @@ AC_OUTPUT([\
helpers/basic_auth/winbind/Makefile \
helpers/digest_auth/Makefile \
helpers/digest_auth/password/Makefile \
+ helpers/digest_auth/ldap/Makefile \
helpers/ntlm_auth/Makefile \
helpers/ntlm_auth/fakeauth/Makefile \
helpers/ntlm_auth/no_check/Makefile \