diff options
| author | unknown <timothy.smith@sun.com> | 2008-11-27 00:02:10 +0100 |
|---|---|---|
| committer | Build Team <bteam@astra04> | 2008-11-27 00:02:10 +0100 |
| commit | 96e0bf50d942258722b25e9d17d209d40eaacd28 (patch) | |
| tree | 8b74eb8ccd3df7d27cd2c237daeafaf3222fb7eb /configure.in | |
| parent | 3d0798d07de937c857c255ce9bfb8c24e10b25e4 (diff) | |
| parent | 74b354091946336ea8663652d4744b43a2c996e3 (diff) | |
| download | mariadb-git-96e0bf50d942258722b25e9d17d209d40eaacd28.tar.gz | |
Merge from mysql-5.1.30-release
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 106c46a45b6..919ab765118 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) |