Merge of mysql-5.1-bugteam into mysql-trunk-merge.

3e5230d2 · Davi Arnaut · 4a0574f6 · e087f69d · 3e5230d2
Commit 3e5230d2 authored Jul 06, 2010 by Davi Arnaut
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

configure.in configure.in +10 -1

No files found.
--- a/configure.in
+++ b/configure.in
@@ -506,7 +506,16 @@ if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
 then
  ABI_CHECK=""
 else
-  ABI_CHECK="abi_check"
+  # 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
 fi

 AC_SUBST(ABI_CHECK)