From c36fee08f6fa7974324438572a260101335cb4b4 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <davi.arnaut@oracle.com>
Date: Tue, 20 Jul 2010 14:44:29 -0300
Subject: Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5         
   due to GCC preprocessor change

The problem is that newer GCC versions treats missing headers
as fatal errors. The solution is to use a guard macro to prevent
the inclusion of system headers when checking the ABI with the
C Preprocessor.

Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15638
           http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44836

Makefile.am:
  Define guard macro.
configure.in:
  Remove workaround.
include/mysql.h:
  Guard the header inclusion.
include/mysql.h.pp:
  Header is not included anymore.
---
 configure.in | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 0264c351b07..8dcdecf8ea2 100644
--- a/configure.in
+++ b/configure.in
@@ -444,16 +444,7 @@ if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
 then
   ABI_CHECK=""
 else
-  # Workaround GCC >= 4.5 - See Bug#52514
-  case `$CC -dumpversion` in
-    [[4-9]].[[5-9]]*)
-      AC_MSG_WARN([ABI check disabled (GCC >= 4.5)])
-      ABI_CHECK=""
-      ;;
-    *)
-      ABI_CHECK="abi_check"
-      ;;
-  esac
+  ABI_CHECK="abi_check"
 fi
 
 AC_SUBST(ABI_CHECK)
-- 
cgit v1.2.1