From a21f8a0e57a3d0eabf24ac8f4fccb6f563ecc3b1 Mon Sep 17 00:00:00 2001
From: "kent.boortz@sun.com" <>
Date: Thu, 6 Nov 2008 19:38:19 +0100
Subject: Back merges from 6.0.8 - Removed some copy/paste between debug and
 normal build in RPM spec - Removed "mysql_upgrade_shell" from RPM build -
 Removed use of "grep -q" in "configure.in", not portable - Improved test to
 disable ABI check not to accidently run for icc

Other changes
- Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast'
- Reenabled "jp" test suite run
---
 configure.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 63ab547f70d..c57c1efee9f 100644
--- a/configure.in
+++ b/configure.in
@@ -377,7 +377,7 @@ fi
 MYSQL_PROG_AR
 
 # libmysqlclient versioning when linked with GNU ld.
-if $LD --version 2>/dev/null|grep -q GNU; then
+if $LD --version 2>/dev/null| grep GNU >/dev/null 2>&1; then
   LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"
   AC_CONFIG_FILES(libmysql/libmysql.ver)
 fi
@@ -449,11 +449,11 @@ AC_SUBST(PERL5)
 
 # Enable the abi_check rule only if gcc is available
 
-if expr "$CC" : ".*gcc.*"
+if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
 then
-  ABI_CHECK="abi_check"
-else
   ABI_CHECK=""
+else
+  ABI_CHECK="abi_check"
 fi
 
 AC_SUBST(ABI_CHECK)
-- 
cgit v1.2.1