Simplified handling of --enable-follow-x-forwarded-for

diff --git a/configure.in b/configure.in
index 0e7f586f81166b245789a644e062bae1d3477b2d..3c10cbb2e42b8513dc68f930f4f83ebba69defa7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1416,17 +1416,17 @@ SQUID_DEFINE_BOOL(USE_LEAKFINDER,$enable_leakfinder,
 AM_CONDITIONAL(MAKE_LEAKFINDER, [test "$enable_leakfinder" = "yes"])
 
 
-squid_opt_follow_xff="yes"
 AC_ARG_ENABLE(follow-x-forwarded-for,
-  AS_HELP_STRING([--enable-follow-x-forwarded-for],[Enable support for following the X-Forwarded-For
+  AS_HELP_STRING([--enable-follow-x-forwarded-for],
+                 [Enable support for following the X-Forwarded-For
                  HTTP header to try to find the IP address of the
                  original or indirect client when a request has
                  been forwarded through other proxies.]), [
-  SQUID_YESNO([$enableval],[unrecognized argument to --enable-follow-x-forwarded-for: $enableval])
-  squid_opt_follow_xff=$enableval
+  SQUID_YESNO([$enableval],
+    [unrecognized argument to --enable-follow-x-forwarded-for: $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,
+AC_MSG_NOTICE([Support for X-Forwarded-For enabled: ${enable_follow_x_forwarded_for:=yes}])
+SQUID_DEFINE_BOOL([FOLLOW_X_FORWARDED_FOR],$enable_follow_x_forwarded_for,
   [Enable following X-Forwarded-For headers])
 
 squid_opt_use_ident="yes"