From: hno <> Date: Mon, 1 Apr 2002 20:06:28 +0000 (+0000) Subject: configure cleanups X-Git-Tag: SQUID_3_0_PRE1~1142 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0961c811bbeea4cb9a284961375dedcd1b1ac973;p=thirdparty%2Fsquid.git configure cleanups - Removed potentially dangerous debugging options. Developers know how to edit configure.in or set defines. - configure --help lineups --- diff --git a/configure.in b/configure.in index 9734196d9b..1c794bd22d 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Configuration input file for Squid dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.258 2002/03/30 16:42:57 hno Exp $ +dnl $Id: configure.in,v 1.259 2002/04/01 13:06:28 hno Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_INIT(src/main.c) AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.6-DEVEL) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.258 $)dnl +AC_REVISION($Revision: 1.259 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -214,23 +214,27 @@ AC_ARG_ENABLE(gnuregex, [ --enable-gnuregex Compile GNUregex], [USE_GNUREGEX=$enableval]) -AC_ARG_ENABLE(xmalloc-debug, -[ --enable-xmalloc-debug Do some simple malloc debugging], -[ if test "$enableval" = "yes" ; then - echo "Malloc debugging enabled" - AC_DEFINE(XMALLOC_DEBUG) - fi -]) - -AC_ARG_ENABLE(xmalloc-debug-trace, -[ --enable-xmalloc-debug-trace - Detailed trace of memory allocations], -[ if test "$enableval" = "yes" ; then - echo "Malloc debug trace enabled" - AC_DEFINE(XMALLOC_TRACE) - AC_DEFINE(XMALLOC_DEBUG) - fi -]) +dnl This is a developer only option.. developers know how to set defines +dnl +dnl AC_ARG_ENABLE(xmalloc-debug, +dnl [ --enable-xmalloc-debug Do some simple malloc debugging], +dnl [ if test "$enableval" = "yes" ; then +dnl echo "Malloc debugging enabled" +dnl AC_DEFINE(XMALLOC_DEBUG) +dnl fi +dnl ]) + +dnl This is a developer only option.. developers know how to set defines +dnl +dnl AC_ARG_ENABLE(xmalloc-debug-trace, +dnl [ --enable-xmalloc-debug-trace +dnl Detailed trace of memory allocations], +dnl [ if test "$enableval" = "yes" ; then +dnl echo "Malloc debug trace enabled" +dnl AC_DEFINE(XMALLOC_TRACE) +dnl AC_DEFINE(XMALLOC_DEBUG) +dnl fi +dnl ]) AC_ARG_ENABLE(xmalloc-statistics, [ --enable-xmalloc-statistics @@ -435,13 +439,15 @@ AC_ARG_ENABLE(delay-pools, fi ]) -AC_ARG_ENABLE(mem-gen-trace, -[ --enable-mem-gen-trace Do trace of memory stuff], -[ if test "$enableval" = "yes" ; then - echo "Memory trace (to file) enabled" - AC_DEFINE(MEM_GEN_TRACE) - fi -]) +dnl This is a developer only option. Developers know how to set defines +dnl +dnl AC_ARG_ENABLE(mem-gen-trace, +dnl [ --enable-mem-gen-trace Do trace of memory stuff], +dnl [ if test "$enableval" = "yes" ; then +dnl echo "Memory trace (to file) enabled" +dnl AC_DEFINE(MEM_GEN_TRACE) +dnl fi +dnl ]) AC_ARG_ENABLE(useragent-log, [ --enable-useragent-log Enable logging of User-Agent header], @@ -452,7 +458,7 @@ AC_ARG_ENABLE(useragent-log, ]) AC_ARG_ENABLE(referer-log, -[ --enable-referer-log Enable logging of Referer header], +[ --enable-referer-log Enable logging of Referer header], [ if test "$enableval" = "yes" ; then echo "Referer logging enabled" AC_DEFINE(USE_REFERER_LOG) @@ -460,7 +466,7 @@ AC_ARG_ENABLE(referer-log, ]) AC_ARG_ENABLE(wccp, -[ --disable-wccp Disable Web Cache Coordination Protocol], +[ --disable-wccp Disable Web Cache Coordination Protocol], [ if test "$enableval" = "no" ; then echo "Web Cache Coordination Protocol disabled" AC_DEFINE(USE_WCCP, 0) @@ -493,13 +499,17 @@ AC_ARG_ENABLE(snmp, AC_SUBST(SNMPLIB) AC_SUBST(makesnmplib) -AC_ARG_ENABLE(time-hack, -[ --enable-time-hack Update internal timestamp only once per second], -[ if test "$enableval" = "yes" ; then - echo "Update internal timestamp only once per second" - AC_DEFINE(ALARM_UPDATES_TIME) - fi -]) +dnl This do not work well.. disable for now so people do not +dnl enable it and thereby cause problems.. (tired of seeing people +dnl having enabled this, and then complaining...) +dnl +dnl AC_ARG_ENABLE(time-hack, +dnl [ --enable-time-hack Update internal timestamp only once per second], +dnl [ if test "$enableval" = "yes" ; then +dnl echo "Update internal timestamp only once per second" +dnl AC_DEFINE(ALARM_UPDATES_TIME) +dnl fi +dnl ]) AC_ARG_ENABLE(cachemgr-hostname, [ --enable-cachemgr-hostname[=hostname] @@ -616,12 +626,13 @@ AC_ARG_ENABLE(cache-digests, dnl Select Default Error language AC_ARG_ENABLE(default-err-language, [ --enable-default-err-language=lang - Select default language for Error pages (see errors dir) ], + Select default language for Error pages (see + errors directory) ], [ if test -d $srcdir/errors/$enableval; then ERR_DEFAULT_LANGUAGE=$enableval else - echo "ERROR! Unknown language $enableval, see errors/" + echo "ERROR! Unknown language $enableval, see errors/ directory" exit 1 fi ],[ERR_DEFAULT_LANGUAGE="English"]) @@ -630,7 +641,8 @@ AC_SUBST(ERR_DEFAULT_LANGUAGE) dnl Select languages to be installed AC_ARG_ENABLE(err-languages, [ --enable-err-languages=\"lang1 lang2..\" - Select languages to be installed. (All will be installed by default) ], + Select languages to be installed. (All will be + installed by default) ], [ for l in $enableval; do if test -d $srcdir/errors/$l; then :; else @@ -661,8 +673,8 @@ AC_ARG_WITH(coss-membuf-size, dnl check for netio plugin stuff dnl Enable poll() AC_ARG_ENABLE(poll, -[ --enable-poll Enable poll() support. - --disable-poll Disable poll() support. ], +[ --enable-poll Enable poll() support. + --disable-poll Disable poll() support. ], [ case "$enableval" in @@ -679,8 +691,8 @@ AC_ARG_ENABLE(poll, dnl Enable select() AC_ARG_ENABLE(select, -[ --enable-select Enable select() support. - --disable-select Disable select() support. ], +[ --enable-select Enable select() support. + --disable-select Disable select() support. ], [ case "$enableval" in @@ -697,8 +709,8 @@ AC_ARG_ENABLE(select, dnl Enable kqueue() AC_ARG_ENABLE(kqueue, -[ --enable-kqueue Enable kqueue() support. - --disable-kqueue Disable kqueue() support. ], +[ --enable-kqueue Enable kqueue() support. + --disable-kqueue Disable kqueue() support. ], [ case "$enableval" in @@ -974,8 +986,8 @@ AC_SUBST(DIGEST_AUTH_HELPERS) dnl Enable "NTLM fail open" AC_ARG_ENABLE(ntlm-fail-open, [ --enable-ntlm-fail-open Enable NTLM fail open, where a helper that fails one of the - Authentication steps can allow squid to still authenticate - the user.], + Authentication steps can allow squid to still authenticate + the user.], [ if test "$enableval" = "yes" ; then AC_DEFINE(NTLM_FAIL_OPEN) fi @@ -1014,11 +1026,12 @@ AC_ARG_ENABLE(stacktraces, dnl Enable X-Accelerator-Vary for Vary support within an accelerator setup AC_ARG_ENABLE(x_accelerator_vary, -[ --enable-x-accelerator-vary Enable support for the X-Accelerator-Vary - HTTP header. Can be used to indicate - variance within an accelerator setup. - Typically used together with other code - that adds custom HTTP headers to the requests.], +[ --enable-x-accelerator-vary + Enable support for the X-Accelerator-Vary + HTTP header. Can be used to indicate + variance within an accelerator setup. + Typically used together with other code + that adds custom HTTP headers to the requests.], [ if test "$enableval" = "yes" ; then echo "Enabling support for X-Accelerator-Vary" AC_DEFINE(X_ACCELERATOR_VARY, 1)