From: kinkie@buildmaster.squid-cache.org <>
Date: Sat, 3 Jan 2015 21:25:56 +0000 (+0000)
Subject: Fixed -Wno-deprecated-register detection
X-Git-Tag: merge-candidate-3-v1~379
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0568bff2d65e3a6abd1dd6b7accaec649d75e58a;p=thirdparty%2Fsquid.git

Fixed -Wno-deprecated-register detection
---

diff --git a/configure.ac b/configure.ac
index ccf625ae04..4c760ec42d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,13 +365,17 @@ else
 fi
 
 dnl CentOS (and RHEL) still define ntohs() using deprecated C++ features
-SQUID_CC_REQUIRE_ARGUMENT([ac_cv_require_Wno_deprecated_register],[-Wno-deprecated-register],[[#include <arpa/inet.h>]],[[int fox=ntohs(1);]])
+SQUID_CC_REQUIRE_ARGUMENT([ac_cv_require_wno_deprecated_register],[-Wno-deprecated-register],[[#include <arpa/inet.h>]],[[int fox=ntohs(1);]])
 
 if test "x$enable_strict_error_checking" != "xno"; then
   SQUID_CFLAGS="$SQUID_CFLAGS $squid_cv_cc_option_werror"
   SQUID_CXXFLAGS="$SQUID_CXXFLAGS $squid_cv_cxx_option_werror"
 fi
 
+if test "x$ac_cv_require_wno_deprecated_register" = "xyes"; then
+  SQUID_CXXFLAGS="$SQUID_CXXFLAGS -Wno-deprecated-register"
+fi
+
 # squid_cv_cc_arg_pipe is set by SQUID_CC_GUESS_OPTIONS
 SQUID_CXXFLAGS="$SQUID_CXXFLAGS $squid_cv_cc_arg_pipe"
 SQUID_CFLAGS="$SQUID_CFLAGS $squid_cv_cc_arg_pipe"