From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 19 Nov 2009 22:41:55 +0000 (+0100)
Subject: Fix handling of --disable-strict-error-checking.
X-Git-Tag: SQUID_3_2_0_1~556
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b45d1574ab3ddcbcbc9512d99757870b5826de8;p=thirdparty%2Fsquid.git

Fix handling of --disable-strict-error-checking.
Add chmod to the list of searched-for programs during configuration.
---

diff --git a/configure.in b/configure.in
index 48c16d93f0..f11b60fd30 100644
--- a/configure.in
+++ b/configure.in
@@ -33,6 +33,17 @@ dnl Make the squid top srcdir available to sub-packages as --with-squid=PATH
 new_configure_args="$ac_configure_args --with-squid=$ac_abs_confdir"
 ac_configure_args="$new_configure_args"
 
+squid_disable_werror="no"
+AC_ARG_ENABLE(strict-error-checking,
+  AS_HELP_STRING([--disable-strict-error-checking],[By default squid is compiled
+                 with all possible static compiler error-checks enbled.
+                 This flag disables the behavior]),
+[ 
+  if test "${enableval}" = "no"
+  then
+    squid_disable_werror="yes"
+  fi
+])
 
 use_loadable_modules=1
 AC_MSG_CHECKING(whether to use loadable modules)
@@ -283,7 +294,8 @@ dnl TODO: check if the problem will be present in any other newer MinGW release.
 	;;
     esac
     SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-    if [ "$squid_disable_werror" = "no" ]; then
+    if test "$squid_disable_werror" = "no"
+    then
         SQUID_CFLAGS="$SQUID_CFLAGS -Werror"
         SQUID_CXXFLAGS="$SQUID_CXXFLAGS -Werror"
     fi
@@ -350,16 +362,6 @@ AC_ARG_ENABLE(inline,
    fi
 ])
 
-squid_disable_werror="no"
-AC_ARG_ENABLE(strict-error-checking,
-  AS_HELP_STRING([--disable-strict-error-checking],[By default squid is compiled
-                 with all possible static compiler error-checks enbled.
-                 This flag disables the behavior]),
-[ if test "$enableval" = "no" ; then
-  squid_disable_werror="yes"
-  fi
-])
-
 if test "$SquidInline" = "yes" ; then
     AC_DEFINE(_SQUID_INLINE_, inline, [Keyword used by squid for inlining methods])
     AC_DEFINE(_USE_INLINE_,, [Include inline methods into header file])
@@ -2467,6 +2469,7 @@ AC_PATH_PROG(TRUE, true, /usr/bin/true)
 AC_PATH_PROG(MV, mv, $FALSE)
 AC_PATH_PROG(MKDIR, mkdir, $FALSE)
 AC_PATH_PROG(LN, ln, cp)
+AC_PATH_PROG(CHMOD, chmod, $FALSE)
 
 AC_PATH_PROG(RM, rm, $FALSE)
 dnl Libtool 2.2.6 requires: rm -f