From: Francesco Chemolli Date: Thu, 15 Apr 2010 15:07:23 +0000 (+0200) Subject: Fixed some text-wrappings and indentations. X-Git-Tag: SQUID_3_2_0_1~271^2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a6b111abd4e2f20e2fa08a1407587c016595f72;p=thirdparty%2Fsquid.git Fixed some text-wrappings and indentations. Reworked default option handling for some configure switches Refactored EUI and HTCP options handling --- diff --git a/configure.in b/configure.in index a798aedd92..d7975d40d4 100644 --- a/configure.in +++ b/configure.in @@ -952,71 +952,69 @@ dnl fi dnl ]) -squid_opt_useragent_log="no" AC_ARG_ENABLE(useragent-log, - AS_HELP_STRING([--enable-useragent-log],[Enable logging of User-Agent header]), [ - SQUID_YESNO([$enableval],[unrecognized argument to --enable-useragent-log: $enableval]) - squid_opt_useragent_log=$enableval + AS_HELP_STRING([--enable-useragent-log], + [Enable logging of User-Agent header]), [ +SQUID_YESNO([$enableval], + [unrecognized argument to --enable-useragent-log: $enableval]) + enable_useragent_log=$enableval ]) -AC_MSG_NOTICE([User-Agent logging enabled: $squid_opt_useragent_log]) -SQUID_DEFINE_UNQUOTED(USE_USERAGENT_LOG,$squid_opt_useragent_log, +SQUID_DEFINE_UNQUOTED(USE_USERAGENT_LOG,${enable_useragent_log:=no}, [If you want to log User-Agent request header values, define this.]) +AC_MSG_NOTICE([User-Agent logging enabled: $enable_useragent_log]) -squid_opt_referer_log="no" AC_ARG_ENABLE(referer-log, AS_HELP_STRING([--enable-referer-log],[Enable logging of Referer header]), [ - SQUID_YESNO([$enableval],[unrecognized argument to --enable-referer-log: $enableval]) - squid_opt_referer_log=$enableval +SQUID_YESNO([$enableval], + [unrecognized argument to --enable-referer-log: $enableval]) ]) -AC_MSG_NOTICE([Referer logging enabled: $squid_opt_referer_log]) -SQUID_DEFINE_UNQUOTED(USE_REFERER_LOG,$squid_opt_referer_log, +SQUID_DEFINE_UNQUOTED(USE_REFERER_LOG,${enable_referer_log:=no}, [If you want to log Referer request header values, define this. - By default, they are written to referer.log in the Squid log directory.]) + By default, they are written to referer.log in the Squid logdir. + This feature is deprecated in favour of custom log formats]) +AC_MSG_NOTICE([Referer logging enabled: $enable_referer_log]) -squid_opt_use_wccp="yes" AC_ARG_ENABLE(wccp, AS_HELP_STRING([--disable-wccp],[Disable Web Cache Coordination Protocol]), [ - SQUID_YESNO([$enableval],[unrecognized argument to --disable-wccp: $enableval]) - squid_opt_use_wccp=$enableval +SQUID_YESNO([$enableval],[unrecognized argument to --disable-wccp: $enableval]) ]) -AC_MSG_NOTICE([Web Cache Coordination Protocol enabled: $squid_opt_use_wccp]) -SQUID_DEFINE_UNQUOTED(USE_WCCP, $squid_opt_use_wccp, [Define to enable WCCP]) +SQUID_DEFINE_UNQUOTED(USE_WCCP, ${enable_wccp:=yes}, [Define to enable WCCP]) +AC_MSG_NOTICE([Web Cache Coordination Protocol enabled: $enable_wccp]) -squid_opt_use_wccp_v2="yes" AC_ARG_ENABLE(wccpv2, - AS_HELP_STRING([--disable-wccpv2],[Disable Web Cache Coordination V2 Protocol]), [ - SQUID_YESNO([$enableval],[unrecognized argument to --disable-wccpv2: $enableval]) - squid_opt_use_wccp_v2=$enableval + AS_HELP_STRING([--disable-wccpv2], + [Disable Web Cache Coordination V2 Protocol]), [ +SQUID_YESNO([$enableval], + [unrecognized argument to --disable-wccpv2: $enableval]) ]) -AC_MSG_NOTICE([Web Cache Coordination V2 Protocol enabled: $squid_opt_use_wccp_v2]) -SQUID_DEFINE_UNQUOTED(USE_WCCPv2,$squid_opt_use_wccp_v2,[Define to enable WCCP V2]) +SQUID_DEFINE_UNQUOTED(USE_WCCPv2,${enable_wccpv2:=yes}, + [Define to enable WCCP V2]) +AC_MSG_NOTICE([Web Cache Coordination V2 Protocol enabled: $enable_wccpv2]) -squid_opt_kill_parent="no" AC_ARG_ENABLE(kill-parent-hack, AS_HELP_STRING([--enable-kill-parent-hack],[Kill parent on shutdown]), [ - SQUID_YESNO([$enableval],[unrecognized argument to --enable-kill-parent-hack: $enableval]) - squid_opt_kill_parent=$enableval +SQUID_YESNO([$enableval], + [unrecognized argument to --enable-kill-parent-hack: $enableval]) ]) -AC_MSG_NOTICE([Kill parent on shutdown hack enabled: $squid_opt_kill_parent]) -SQUID_DEFINE_UNQUOTED(KILL_PARENT_OPT,$squid_opt_kill_parent, - [A dangerous feature which causes Squid to kill its parent process - (presumably the RunCache script) upon receipt of SIGTERM or SIGINT. - Use with caution.]) +SQUID_DEFINE_UNQUOTED(KILL_PARENT_OPT,${enable_kill_parent_hack:=no}, + [A dangerous feature which causes Squid to kill its parent + process (presumably the RunCache script) upon receipt + of SIGTERM or SIGINT. Deprecated, Use with caution.]) +AC_MSG_NOTICE([Kill parent on shutdown hack enabled: $enable_kill_parent_hack]) -squid_opt_enable_snmp="yes" AC_ARG_ENABLE(snmp, AS_HELP_STRING([--disable-snmp],[Disable SNMP monitoring support]), [ - SQUID_YESNO([$enableval],[unrecognized argument to --disable-snmp: $enableval]) - squid_opt_enable_snmp=$enableval + SQUID_YESNO([$enableval], + [unrecognized argument to --disable-snmp: $enableval]) ]) -if test "$squid_opt_enable_snmp" = "yes"; then +SQUID_DEFINE_UNQUOTED(SQUID_SNMP,${enable_snmp:=yes}, + [Define to enable SNMP monitoring of Squid]) +AM_CONDITIONAL(USE_SNMP, [test "$enable_snmp" = "yes"]) +if test "$enable_snmp" = "yes"; then SNMPLIB='../snmplib/libsnmp.a' makesnmplib=snmplib fi -AC_MSG_NOTICE([SNMP support enabled: $squid_opt_enable_snmp]) -SQUID_DEFINE_UNQUOTED(SQUID_SNMP,$squid_opt_enable_snmp, - [Define to enable SNMP monitoring of Squid]) -AM_CONDITIONAL(USE_SNMP, [test "$squid_opt_enable_snmp" = "yes"]) +AC_MSG_NOTICE([SNMP support enabled: $enable_snmp]) AC_SUBST(SNMPLIB) AC_SUBST(makesnmplib) @@ -1040,12 +1038,12 @@ AC_ARG_ENABLE(cachemgr-hostname, esac ]) -squid_opt_use_eui="yes" AC_ARG_ENABLE(eui, - AS_HELP_STRING([--disable-eui],[Enable use of ARP / MAC/ EUI (ether address)]), - [squid_opt_use_eui="$enableval"]) -if test "$squid_opt_use_eui" = "yes" ; then - AC_MSG_NOTICE([EUI controls enabled (ether address)]) + AS_HELP_STRING([--disable-eui], + [Enable use of ARP / MAC/ EUI (ether address)]), [ +SQUID_YESNO([$enableval],[--disable-eui expects no arguments]) +]) +if test ${enable_eui:=yes} = "yes" ; then case "$squid_host_os" in linux|solaris|freebsd|openbsd|netbsd) ${TRUE} @@ -1054,7 +1052,7 @@ if test "$squid_opt_use_eui" = "yes" ; then EUILIB="-liphlpapi" ;; *) - AC_MSG_WARN([EUI support probably won't work on host $host.]) + AC_MSG_WARN([EUI support probably will not work on host $host.]) ;; esac AC_CHECK_HEADERS( \ @@ -1069,21 +1067,22 @@ if test "$squid_opt_use_eui" = "yes" ; then sys/ioctl.h \ ) fi -AC_MSG_NOTICE([EUI controls enabled: $squid_opt_use_eui]) -SQUID_DEFINE_UNQUOTED(USE_SQUID_EUI,$squid_opt_use_eui, - [Define this to include code which lets you use ethernet hardware addresses. This code uses API initially defined in 4.4-BSD.]) -AM_CONDITIONAL(USE_SQUID_EUI, [test "$squid_opt_use_eui" = "yes" ]) +AC_MSG_NOTICE([EUI (MAC address) controls enabled: $enable_eui]) +SQUID_DEFINE_UNQUOTED(USE_SQUID_EUI,$enable_eui, + [Define this to include code which lets you use ethernet addresses. This code uses API initially defined in 4.4-BSD.]) +AM_CONDITIONAL(USE_SQUID_EUI, [test "$enable" = "yes" ]) + -squid_opt_enable_htcp="yes" AC_ARG_ENABLE(htcp, AS_HELP_STRING([--disable-htcp],[Disable HTCP protocol support]), [ - SQUID_YESNO([$enableval],[unrecognized argument to --disable-htcp: $enableval]) - squid_opt_enable_htcp=$enableval +SQUID_YESNO([$enableval], + [unrecognized argument to --disable-htcp: $enableval]) ]) -AC_MSG_NOTICE([HTCP support enabled: $squid_opt_enable_htcp]) -SQUID_DEFINE_UNQUOTED([USE_HTCP],$squid_opt_enable_htcp, +SQUID_DEFINE_UNQUOTED([USE_HTCP],${enable_htcp:=yes}, [Define this to include code for the Hypertext Cache Protocol (HTCP)]) -AM_CONDITIONAL(ENABLE_HTCP, [test "$squid_opt_enable_htcp" = "yes"]) +AM_CONDITIONAL(ENABLE_HTCP, [test "$enable_htcp" = "yes"]) +AC_MSG_NOTICE([HTCP support enabled: $enable_htcp]) + dnl TODO KK: SSL not yet refactored dnl SSL is not enabled by default.