From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 24 Dec 2010 14:00:09 +0000 (-0700)
Subject: CPU profiler is a dev testing feature. Disable by default.
X-Git-Tag: take00~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13e41ca5abcc2e031dbaefa81de967ff9e9632c6;p=thirdparty%2Fsquid.git

CPU profiler is a dev testing feature. Disable by default.
---

diff --git a/configure.ac b/configure.ac
index 1394e0ff98..d846a6ad95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2103,14 +2103,12 @@ AC_ARG_ENABLE(cpu-profiling,
 SQUID_YESNO([$enableval],
             [unrecognized argument to --enable-cpu-profiling: $enableval])
 ])
-if test "x$enable_cpu_profiling" != "xno"; then
+# Default OFF. This is a debug feature. Only check and enable if forced ON.
+if test "x$enable_cpu_profiling" = "xyes"; then
   SQUID_CHECK_FUNCTIONAL_CPU_PROFILER
-  if test "x$enable_cpu_profiling" = "xyes" -a "x$squid_cv_cpu_profiler_works" = "xno"; then
+  if test "x$squid_cv_cpu_profiler_works" = "xno"; then
     AC_MSG_ERROR([CPU profiling will not be functional in this build.])
-  elif test "x$squid_cv_cpu_profiler_works" = "xno"; then
-    AC_MSG_NOTICE([CPU profiling will not be functional in this build.])
   fi
-  enable_cpu_profiling="$squid_cv_cpu_profiler_works"
 fi
 SQUID_DEFINE_BOOL(USE_XPROF_STATS,${enable_cpu_profiling:=no},
                       [Define to enable CPU profiling within Squid])