From: Brian Aker <brian@tangent.org>
Date: Mon, 17 Sep 2012 11:03:33 +0000 (-0700)
Subject: Fix flag that clang knows nothing about.
X-Git-Tag: 1.0.12~23^2~7
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=313f3a89d2b257c256cc5d7d656c12c9a6ca2bc7;p=m6w6%2Flibmemcached

Fix flag that clang knows nothing about.
---

diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4
index a8e1e83b..4d647996 100644
--- a/m4/ax_harden_compiler_flags.m4
+++ b/m4/ax_harden_compiler_flags.m4
@@ -72,6 +72,7 @@
       AX_APPEND_COMPILE_FLAGS([-Wold-style-definition])
       AX_APPEND_COMPILE_FLAGS([-Woverride-init])
       AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes])
+      AX_APPEND_COMPILE_FLAGS([-Wlogical-op])
       AC_LANG_POP
       ])
 
@@ -95,6 +96,7 @@
       AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized])
       AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers])
       AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn])
+      AX_APPEND_COMPILE_FLAGS([-Wlogical-op])
       AX_APPEND_COMPILE_FLAGS([-Wnon-virtual-dtor])
       AX_APPEND_COMPILE_FLAGS([-Wnormalized=id])
       AX_APPEND_COMPILE_FLAGS([-Woverloaded-virtual])
diff --git a/m4/pandora_warnings.m4 b/m4/pandora_warnings.m4
index d31965e0..91343dc8 100644
--- a/m4/pandora_warnings.m4
+++ b/m4/pandora_warnings.m4
@@ -277,22 +277,6 @@ uint16_t x= htons(80);
       AS_IF([test "$ac_cv_safe_to_use_Wframe_larger_than_" = "yes"],
             [CXX_WARNINGS="${CXX_WARNINGS} -Wframe-larger-than=32768"])
   
-      AC_CACHE_CHECK([whether it is safe to use -Wlogical-op],
-        [ac_cv_safe_to_use_Wlogical_op_],
-        [save_CFLAGS="$CFLAGS"
-         CFLAGS="${W_FAIL} -pedantic -Wlogical-op ${AM_CFLAGS} ${CFLAGS}"
-         AC_COMPILE_IFELSE([
-           AC_LANG_PROGRAM(
-           [[
-#include <stdio.h>
-           ]], [[]])
-        ],
-        [ac_cv_safe_to_use_Wlogical_op_=yes],
-        [ac_cv_safe_to_use_Wlogical_op_=no])
-      CFLAGS="$save_CFLAGS"])
-      AS_IF([test "$ac_cv_safe_to_use_Wlogical_op_" = "yes"],
-            [CC_WARNINGS="${CC_WARNINGS} -Wlogical-op"])
-  
       AC_CACHE_CHECK([whether it is safe to use -Wredundant-decls from C++],
         [ac_cv_safe_to_use_Wredundant_decls_],
         [AC_LANG_PUSH(C++)