Simplified handling of --enable-leakfinder

diff --git a/configure.in b/configure.in
index e5ff0e86a8775525ccc7a669169cf297f634dba7..0e7f586f81166b245789a644e062bae1d3477b2d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1402,19 +1402,18 @@ default|"")
 esac
 
 dnl Enable Leak Finding Functions
-squid_opt_enable_leakfinder=no
 AC_ARG_ENABLE(leakfinder,
   AS_HELP_STRING([--enable-leakfinder],
     [Enable Leak Finding code. Enabling this alone does nothing;
      you also have to modify the source code to use the leak
      finding functions. Probably Useful for hackers only.]), [ 
-  SQUID_YESNO([$enableval],[unrecognized argument to --enable-leakfinder: $enableval])
-  squid_opt_enable_leakfinder=$enableval
+  SQUID_YESNO([$enableval],
+     [unrecognized argument to --enable-leakfinder: $enableval])
 ])
-AC_MSG_NOTICE([Leak Finder enabled: $squid_opt_enable_leakfinder])
-SQUID_DEFINE_BOOL(USE_LEAKFINDER,$squid_opt_enable_leakfinder,
+AC_MSG_NOTICE([Leak Finder enabled: ${enable_leakfinder:=no}])
+SQUID_DEFINE_BOOL(USE_LEAKFINDER,$enable_leakfinder,
   [Enable code for assisting in finding memory leaks. Not for the faint of heart])
-AM_CONDITIONAL(MAKE_LEAKFINDER, [test "$squid_opt_enable_leakfinder" = "yes"])
+AM_CONDITIONAL(MAKE_LEAKFINDER, [test "$enable_leakfinder" = "yes"])
 
 
 squid_opt_follow_xff="yes"