--------------------- PatchSet 7898 Date: 2006/05/23 14:47:02 Author: hno Branch: autotools-2_6 Tag: (none) Log: Cleanup stuff the translation script could have done better.. Members: configure.in:1.96.2.1->1.96.2.2 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.96.2.1 retrieving revision 1.96.2.2 diff -u -r1.96.2.1 -r1.96.2.2 --- squid/configure.in 23 May 2006 14:28:42 -0000 1.96.2.1 +++ squid/configure.in 23 May 2006 14:47:02 -0000 1.96.2.2 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.96.2.1 2006/05/23 14:28:42 hno Exp $ +dnl $Id: configure.in,v 1.96.2.2 2006/05/23 14:47:02 hno Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.6.DEVEL-CVS) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.96.2.1 $)dnl +AC_REVISION($Revision: 1.96.2.2 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -67,11 +67,9 @@ fi dnl Substitutions -AC_DEFINE_UNQUOTED(CACHE_HTTP_PORT, $CACHE_HTTP_PORT, [What default TCP port to use for HTTP listening? -#ifndef CACHE_HTTP_PORT]) +AC_DEFINE_UNQUOTED(CACHE_HTTP_PORT, $CACHE_HTTP_PORT, [What default TCP port to use for HTTP listening?]) AC_SUBST(CACHE_HTTP_PORT) -AC_DEFINE_UNQUOTED(CACHE_ICP_PORT, $CACHE_ICP_PORT, [What default UDP port to use for ICP listening? -#ifndef CACHE_ICP_PORT]) +AC_DEFINE_UNQUOTED(CACHE_ICP_PORT, $CACHE_ICP_PORT, [What default UDP port to use for ICP listening?]) AC_SUBST(CACHE_ICP_PORT) AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host", [Host type from configure]) @@ -462,13 +460,13 @@ [ if test "$enableval" = "yes" ; then echo "ICMP enabled" AC_DEFINE(USE_ICMP, 1, [If you want to use Squid's ICMP features (highly recommended!) then -define this. When USE_ICMP is defined, Squid will send ICMP pings -to origin server sites. This information is used in numerous ways: -- Sent in ICP replies so neighbor caches know how close -you are to the source. -- For finding the closest instance of a URN. -- With the 'test_reachability' option. Squid will return -ICP_OP_MISS_NOFETCH for sites which it cannot ping.]) + define this. When USE_ICMP is defined, Squid will send ICMP pings + to origin server sites. This information is used in numerous ways: + - Sent in ICP replies so neighbor caches know how close + you are to the source. + - For finding the closest instance of a URN. + - With the 'test_reachability' option. Squid will return + ICP_OP_MISS_NOFETCH for sites which it cannot ping.]) AM_CONDITIONAL(ENABLE_PINGER, true) fi ]) @@ -498,8 +496,7 @@ [ if test "$enableval" = "yes" ; then echo "User-Agent logging enabled" AC_DEFINE(USE_USERAGENT_LOG, 1, [If you want to log User-Agent request header values, define this. -By default, they are written to useragent.log in the Squid log -directory.]) + By default, they are written to useragent.log in the Squid log directory.]) fi ]) @@ -508,8 +505,7 @@ [ if test "$enableval" = "yes" ; then echo "Referer logging enabled" AC_DEFINE(USE_REFERER_LOG, 1, [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 log directory.]) fi ]) @@ -539,8 +535,7 @@ [ if test "$enableval" = "yes" ; then echo "Kill parent on shutdown" AC_DEFINE(KILL_PARENT_OPT, 1, [A dangerous feature which causes Squid to kill its parent process -(presumably the RunCache script) upon receipt of SIGTERM or SIGINT. -Use with caution.]) + (presumably the RunCache script) upon receipt of SIGTERM or SIGINT. Use with caution.]) fi ]) @@ -591,11 +586,8 @@ : # Nothing to do.. ;; *) - AC_DEFINE_UNQUOTED(CACHEMGR_HOSTNAME, "${enableval}", [******************************** -START OF CONFIGURABLE OPTIONS * -******************************** -If you are upset that the cachemgr.cgi form comes up with the hostname -field blank, then define this to getfullhostname()]) + AC_DEFINE_UNQUOTED(CACHEMGR_HOSTNAME, "${enableval}", [If you are upset that the cachemgr.cgi form comes up with the hostname + field blank, then define this to getfullhostname()]) echo "Cachemgr default hostname set to ${enableval}" ;; esac @@ -624,8 +616,8 @@ ;; esac AC_DEFINE(USE_ARP_ACL, 1, [Define this to include code which lets you specify access control -elements based on ethernet hardware addresses. This code uses -functions found in 4.4 BSD derviations (e.g. FreeBSD, ?).]) + elements based on ethernet hardware addresses. This code uses + functions found in 4.4 BSD derviations (e.g. FreeBSD, ?).]) fi ]) @@ -683,8 +675,8 @@ if test -n "$USE_OPENSSL"; then echo "Using OpenSSL MD5 implementation" AC_DEFINE(USE_OPENSSL, 1, [Define this to make use of the OpenSSL libraries for -MD5 calculation rather than Squid's own MD5 implementation -or if building with SSL encryption (USE_SSL)]) + MD5 calculation rather than Squid's own MD5 implementation + or if building with SSL encryption (USE_SSL)]) AM_CONDITIONAL(NEED_OWN_MD5, false) if test -z "$SSLLIB"; then SSLLIB="-lcrypto" # for MD5 routines @@ -711,7 +703,7 @@ [ if test "$enableval" = "yes" ; then echo "USE_CACHE_DIGESTS enabled" AC_DEFINE(USE_CACHE_DIGESTS, 1, [Use Cache Digests for locating objects in neighbor caches. This -code is still semi-experimental.]) + code is still semi-experimental.]) fi ]) @@ -833,8 +825,8 @@ [ if test "$enableval" = "yes" ; then echo "IP-Filter Transparent Proxy enabled" AC_DEFINE(IPF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using IP-Filter -address redirection. This provides "masquerading" support for non -Linux system.]) + address redirection. This provides "masquerading" support for non + Linux system.]) IPF_TRANSPARENT="yes" fi ]) @@ -847,7 +839,7 @@ [ if test "$enableval" = "yes" ; then echo "PF Transparent Proxy enabled" AC_DEFINE(PF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using PF address -redirection. This provides "masquerading" support for OpenBSD.]) + redirection. This provides "masquerading" support for OpenBSD.]) PF_TRANSPARENT="yes" fi ]) @@ -1003,7 +995,7 @@ ]) if test "$use_dnsserver" = "yes"; then AC_DEFINE(USE_DNSSERVERS, 1, [If --disable-internal-dns was given to configure, then we'll use -the dnsserver processes instead.]) + the dnsserver processes instead.]) AM_CONDITIONAL(USE_DNSSERVER, true) fi @@ -1352,7 +1344,7 @@ if test "$use_unlinkd" = "yes"; then echo "unlinkd enabled" AC_DEFINE(USE_UNLINKD, 1, [Define this if unlinkd is required -(strongly recommended for ufs storage type)]) + (strongly recommended for ufs storage type)]) AM_CONDITIONAL(ENABLE_UNLINKD, true) else echo "unlinkd disabled" @@ -1730,8 +1722,8 @@ ]) if test $ac_cv_type_socklen_t = no; then AC_DEFINE(socklen_t, int, [This makes warnings go away. If you have socklen_t defined in your -/usr/include files, then this should remain undef'd. Otherwise it -should be defined to int.]) + /usr/include files, then this should remain undef'd. Otherwise it + should be defined to int.]) fi dnl Check for mtyp_t in some headers @@ -2104,8 +2096,8 @@ ) if test "$ac_cv_func_setresuid" = "yes" ; then AC_DEFINE(HAVE_SETRESUID, 1, [Yay! Another Linux brokenness. Its not good enough to know that -setresuid() exists, because RedHat 5.0 declare setresuid() but -doesn't implement it.]) + setresuid() exists, because RedHat 5.0 declare setresuid() but + doesn't implement it.]) fi AM_CONDITIONAL(NEED_OWN_SNPRINTF, false) @@ -2182,20 +2174,20 @@ test "$ac_cv_header_ip_nat_h" = "yes" ; then IPF_TRANSPARENT="yes" AC_DEFINE(IPF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using IP-Filter -address redirection. This provides "masquerading" support for non -Linux system.]) + address redirection. This provides "masquerading" support for non + Linux system.]) elif test "$have_ipfilter_compat_header" = "yes" && test "$ac_cv_header_netinet_ip_fil_h" = "yes" && test "$ac_cv_header_netinet_ip_nat_h" = "yes" ; then IPF_TRANSPARENT="yes" AC_DEFINE(IPF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using IP-Filter -address redirection. This provides "masquerading" support for non -Linux system.]) + address redirection. This provides "masquerading" support for non + Linux system.]) else IPF_TRANSPARENT="no" AC_DEFINE(IPF_TRANSPARENT, 0, [Enable support for Transparent Proxy on systems using IP-Filter -address redirection. This provides "masquerading" support for non -Linux system.]) + address redirection. This provides "masquerading" support for non + Linux system.]) fi AC_MSG_RESULT($IPF_TRANSPARENT) fi @@ -2223,11 +2215,11 @@ if test "$ac_cv_header_net_pfvar_h" = "yes"; then PF_TRANSPARENT="yes" AC_DEFINE(PF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using PF address -redirection. This provides "masquerading" support for OpenBSD.]) + redirection. This provides "masquerading" support for OpenBSD.]) else PF_TRANSPARENT="no" AC_DEFINE(PF_TRANSPARENT, 0, [Enable support for Transparent Proxy on systems using PF address -redirection. This provides "masquerading" support for OpenBSD.]) + redirection. This provides "masquerading" support for OpenBSD.]) fi AC_MSG_RESULT($PF_TRANSPARENT) fi