diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
| commit | 32f3ab7933240277e52f05e39e4d45f19f7ac3d7 (patch) | |
| tree | 16a66be92ba2603896b1b010600df021911be256 /configure.in | |
| parent | d85c6281802c8f6ef7187518f9f4357d96134b3e (diff) | |
| parent | 6bd182e9f22e02f29e7f14e6dd8bf14eaeee084e (diff) | |
| download | mariadb-git-32f3ab7933240277e52f05e39e4d45f19f7ac3d7.tar.gz | |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/configure.in b/configure.in index f4db1d2b39e..7121a521f87 100644 --- a/configure.in +++ b/configure.in @@ -463,16 +463,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) @@ -3045,7 +3036,8 @@ fi AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile dnl - unittest/mysys/Makefile unittest/examples/Makefile dnl + unittest/mysys/Makefile unittest/strings/Makefile dnl + unittest/examples/Makefile dnl strings/Makefile regex/Makefile storage/Makefile dnl man/Makefile BUILD/Makefile vio/Makefile dnl libmysql/Makefile libmysql_r/Makefile client/Makefile dnl |