From: Francesco Chemolli Date: Wed, 7 Jul 2010 13:05:17 +0000 (+0200) Subject: Increased consistency in configure.in quoting X-Git-Tag: SQUID_3_2_0_1~85 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f658b5b77457bee72d66f6d9f080a98ec894f26;p=thirdparty%2Fsquid.git Increased consistency in configure.in quoting Fixed some compilation conditionals --- diff --git a/configure.in b/configure.in index adec092621..788ddcce73 100644 --- a/configure.in +++ b/configure.in @@ -469,7 +469,7 @@ fi AC_MSG_RESULT([${squid_disk_module_candidates:-none}]) SQUID_CHECK_EXISTING_MODULES([$srcdir/src/DiskIO],[squid_disk_module_candidates]) -SQUID_DEFINE_BOOL([USE_DISKIO],$squid_opt_enable_diskio, +SQUID_DEFINE_BOOL(USE_DISKIO,$squid_opt_enable_diskio, [DiskIO modules are expected to be available.]) @@ -866,7 +866,7 @@ AC_SUBST(XMLLIB) AC_ARG_ENABLE(icap-client, AS_HELP_STRING([--enable-icap-client],[Enable the ICAP client.]), [squid_opt_use_icap_client=$enableval], [squid_opt_use_icap_client=no]) -SQUID_DEFINE_BOOL([ICAP_CLIENT],$squid_opt_use_icap_client, +SQUID_DEFINE_BOOL(ICAP_CLIENT,$squid_opt_use_icap_client, [Enable ICAP client features in Squid]) AM_CONDITIONAL(USE_ICAP_CLIENT, [test "$squid_opt_use_icap_client" = "yes" ]) if test "$squid_opt_use_icap_client" = "yes" ; then @@ -1075,7 +1075,7 @@ AC_ARG_ENABLE(htcp, SQUID_YESNO([$enableval], [unrecognized argument to --disable-htcp: $enableval]) ]) -SQUID_DEFINE_BOOL([USE_HTCP],${enable_htcp:=yes}, +SQUID_DEFINE_BOOL(USE_HTCP,${enable_htcp:=yes}, [Define this to include code for the Hypertext Cache Protocol (HTCP)]) AM_CONDITIONAL(ENABLE_HTCP, [test "$enable_htcp" = "yes"]) AC_MSG_NOTICE([HTCP support enabled: $enable_htcp]) @@ -1427,7 +1427,7 @@ AC_ARG_ENABLE(follow-x-forwarded-for, squid_opt_follow_xff=$enableval ]) AC_MSG_NOTICE([Support for X-Forwarded-For enabled: $squid_opt_follow_xff]) -SQUID_DEFINE_BOOL([FOLLOW_X_FORWARDED_FOR],$squid_opt_follow_xff, +SQUID_DEFINE_BOOL(FOLLOW_X_FORWARDED_FOR,$squid_opt_follow_xff, [Enable following X-Forwarded-For headers]) squid_opt_use_ident="yes" @@ -1485,7 +1485,7 @@ SQUID_YESNO([$enableval], [unrecognized argument to --enable-auth: $enableval]) ]) AC_MSG_NOTICE([Authentication support enabled: ${enable_auth:=yes}]) -SQUID_DEFINE_BOOL([USE_AUTH],$enable_auth, +SQUID_DEFINE_BOOL(USE_AUTH,$enable_auth, [Enable support for authentication]) AUTH_MODULES="" @@ -2000,7 +2000,7 @@ AC_ARG_ENABLE(unlinkd, SQUID_YESNO([$enableval], [unrecognized argument to --disable-unlinkd: $enableval]) ]) -SQUID_DEFINE_BOOL([USE_UNLINKD],${enable_unlinkd:=yes}, +SQUID_DEFINE_BOOL(USE_UNLINKD,${enable_unlinkd:=yes}, [Enable useage of unlinkd]) AM_CONDITIONAL(ENABLE_UNLINKD,test "$enable_unlinkd" = "yes") AC_MSG_NOTICE([unlinkd enabled: $enable_unlinkd]) @@ -2012,7 +2012,7 @@ AC_ARG_ENABLE(stacktraces, SQUID_YESNO([$enableval], [unrecognized argument to --enable-stacktraces: $enableval]) ]) -SQUID_DEFINE_BOOL([PRINT_STACK_TRACE],${enable_stacktraces:=no}, +SQUID_DEFINE_BOOL(PRINT_STACK_TRACE,${enable_stacktraces:=no}, [Print stack traces on fatal errors]) AC_MSG_NOTICE([Automatically print stack trace on fatal errors: $enable_stacktraces]) @@ -2032,7 +2032,7 @@ AC_ARG_ENABLE(cpu-profiling, SQUID_YESNO([$enableval], [unrecognized argument to --enable-cpu-profiling: $enableval]) ]) -SQUID_DEFINE_BOOL([USE_XPROF_STATS],${enable_cpu_profiling:=no}, +SQUID_DEFINE_BOOL(USE_XPROF_STATS,${enable_cpu_profiling:=no}, [Define to enable CPU profiling within Squid]) AM_CONDITIONAL(ENABLE_XPROF_STATS, test $enable_cpu_profiling = "yes") @@ -2049,7 +2049,7 @@ AC_ARG_ENABLE(x-accelerator-vary, SQUID_YESNO([$enableval], [unrecognized argument to --enable-x-accelerator-vary: $enableval]) ]) -SQUID_DEFINE_BOOL([X_ACCELERATOR_VARY],${enable_x_accelerator_vary:=no}, +SQUID_DEFINE_BOOL(X_ACCELERATOR_VARY,${enable_x_accelerator_vary:=no}, [Enable support for the X-Accelerator-Vary HTTP header]) AC_MSG_NOTICE([X-Accelerator-Vary support enabled: $enable_x_accelerator_vary]) @@ -2059,7 +2059,7 @@ AC_ARG_ENABLE(zph-qos, SQUID_YESNO([$enableval], [unrecognized argument to --enable-zph-qos: $enableval]) ]) -SQUID_DEFINE_BOOL([USE_ZPH_QOS],${enable_zph_qos:=no}, +SQUID_DEFINE_BOOL(USE_ZPH_QOS,${enable_zph_qos:=no}, [Enable Zero Penalty Hit QOS. When set, Squid will alter the TOS field of HIT responses to help policing network traffic]) AC_MSG_NOTICE([ZPH QOS enabled: $enable_zph_qos]) @@ -3166,7 +3166,7 @@ if test "$enable_ipf_transparent" != "no" ; then AC_MSG_RESULT($IPF_TRANSPARENT) fi AC_MSG_NOTICE([IPF-based transparent proxying enabled: $enable_ipf_transparent]) -SQUID_DEFINE_BOOL([IPF_TRANSPARENT],$enable_ipf_transparent, +SQUID_DEFINE_BOOL(IPF_TRANSPARENT,$enable_ipf_transparent, [Enable support for IPF-style transparent proxying]) if test "$enable_ipf_transparent" = "yes" -a "$squid_host_os" = "solaris" ; then @@ -3191,7 +3191,7 @@ if test "$enable_pf_transparent" != "no" ; then enable_pf_transparent="no" fi fi -SQUID_DEFINE_BOOL([PF_TRANSPARENT],$enable_pf_transparent, +SQUID_DEFINE_BOOL(PF_TRANSPARENT,$enable_pf_transparent, [Enable support for PF-style transparent proxying]) if test "$enable_linux_netfilter" != "no" ; then @@ -3207,7 +3207,7 @@ if test "$enable_linux_netfilter" != "no" ; then fi fi fi -SQUID_DEFINE_BOOL([LINUX_NETFILTER],$enable_linux_netfilter, +SQUID_DEFINE_BOOL(LINUX_NETFILTER,$enable_linux_netfilter, [Enable support for Transparent Proxy on Linux via Netfilter]) dnl Netfilter TPROXY depends on libcap but the NAT parts can still work. diff --git a/include/cache_snmp.h b/include/cache_snmp.h index 2617757125..c0bcb9846e 100644 --- a/include/cache_snmp.h +++ b/include/cache_snmp.h @@ -4,7 +4,7 @@ #ifndef SQUID_CACHE_SNMP_H #define SQUID_CACHE_SNMP_H -#ifdef SQUID_SNMP +#if SQUID_SNMP #if SIZEOF_LONG == 8 #define snint int diff --git a/src/main.cc b/src/main.cc index 9e480fec4e..3d57d31524 100644 --- a/src/main.cc +++ b/src/main.cc @@ -613,7 +613,7 @@ shut_down(int sig) debugs(1, 1, "kill " << getppid() << ": " << xstrerror()); } -#endif +#endif /* KILL_PARENT_OPT */ #if SA_RESETHAND == 0 signal(SIGTERM, SIG_DFL);