From bc5430aa95ac672a82bedb88e3f5081a8fdadb1c Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 23 Nov 2012 16:24:24 -0500
Subject: [PATCH] Remove -Wlogical-op from standard compiler flags

It creates too many warnings with GCC 4.3 and 4.4.
---
 configure    | 60 ----------------------------------------------------
 configure.in |  1 -
 2 files changed, 61 deletions(-)

diff --git a/configure b/configure
index f7048c6b03..85b4b952cb 100755
--- a/configure
+++ b/configure
@@ -4072,66 +4072,6 @@ if test x"$pgac_cv_prog_cc_cflags__Wendif_labels" = x"yes"; then
   CFLAGS="$CFLAGS -Wendif-labels"
 fi
 
-  { $as_echo "$as_me:$LINENO: checking whether $CC supports -Wlogical-op" >&5
-$as_echo_n "checking whether $CC supports -Wlogical-op... " >&6; }
-if test "${pgac_cv_prog_cc_cflags__Wlogical_op+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  pgac_save_CFLAGS=$CFLAGS
-CFLAGS="$pgac_save_CFLAGS -Wlogical-op"
-ac_save_c_werror_flag=$ac_c_werror_flag
-ac_c_werror_flag=yes
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  pgac_cv_prog_cc_cflags__Wlogical_op=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	pgac_cv_prog_cc_cflags__Wlogical_op=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_c_werror_flag=$ac_save_c_werror_flag
-CFLAGS="$pgac_save_CFLAGS"
-fi
-{ $as_echo "$as_me:$LINENO: result: $pgac_cv_prog_cc_cflags__Wlogical_op" >&5
-$as_echo "$pgac_cv_prog_cc_cflags__Wlogical_op" >&6; }
-if test x"$pgac_cv_prog_cc_cflags__Wlogical_op" = x"yes"; then
-  CFLAGS="$CFLAGS -Wlogical-op"
-fi
-
   { $as_echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
 $as_echo_n "checking whether $CC supports -Wmissing-format-attribute... " >&6; }
 if test "${pgac_cv_prog_cc_cflags__Wmissing_format_attribute+set}" = set; then
diff --git a/configure.in b/configure.in
index e691b1d0bf..2dee4b392b 100644
--- a/configure.in
+++ b/configure.in
@@ -410,7 +410,6 @@ if test "$GCC" = yes -a "$ICC" = no; then
   # These work in some but not all gcc versions
   PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
   PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
-  PGAC_PROG_CC_CFLAGS_OPT([-Wlogical-op])
   PGAC_PROG_CC_CFLAGS_OPT([-Wmissing-format-attribute])
   # This was included in -Wall/-Wformat in older GCC versions
   PGAC_PROG_CC_CFLAGS_OPT([-Wformat-security])