diff options
| author | unknown <kent.boortz@sun.com> | 2008-11-06 19:38:19 +0100 |
|---|---|---|
| committer | Build Team <bteam@astra04> | 2008-11-06 19:38:19 +0100 |
| commit | 2f08a0798d935ccd93e4bc2ee34dd60e0c9c3c0f (patch) | |
| tree | 597b1c9155fa14c05cfc6653eba9966dc7eb73bd /config | |
| parent | e9be23fae6129b96cf20fa5a0938a7bad77a5df2 (diff) | |
| download | mariadb-git-2f08a0798d935ccd93e4bc2ee34dd60e0c9c3c0f.tar.gz | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 9df96a7750b..5ee136f2266 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -280,7 +280,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ esac # libndbclient 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 NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver" AC_CONFIG_FILES(storage/ndb/src/libndb.ver) fi |