diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
| commit | 3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e (patch) | |
| tree | da0e622896425203d23ecdfd1bc77b57e3502edf /config | |
| parent | 869f5d0e81d5cbecaec3605f292fbb363b9ccbf6 (diff) | |
| parent | f83e594218a6d19da2fa1ea2a01d860c30fe2913 (diff) | |
| download | mariadb-git-3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e.tar.gz | |
Merge with 5.1 to get in changes from MySQL 5.1.55
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/maintainer.m4 | 6 | ||||
| -rw-r--r-- | config/ac-macros/zlib.m4 | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/ac-macros/maintainer.m4 b/config/ac-macros/maintainer.m4 index 9b4bf3d076b..7b7df2668cd 100644 --- a/config/ac-macros/maintainer.m4 +++ b/config/ac-macros/maintainer.m4 @@ -15,10 +15,14 @@ AC_DEFUN([MY_MAINTAINER_MODE], [ # Set warning options required under maintainer mode. AC_DEFUN([MY_MAINTAINER_MODE_WARNINGS], [ + # Detect ICC posing as GCC. + AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER], + [INTEL_COMPILER=no], [INTEL_COMPILER=yes]) # Setup GCC warning options. - AS_IF([test "$GCC" = "yes"], [ + AS_IF([test "$GCC" = "yes" -a "$INTEL_COMPILER" = "no"], [ C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror -DFORCE_INIT_OF_VARS" CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter" + C_WARNINGS="${C_WARNINGS} -Wdeclaration-after-statement" ]) # Test whether the warning options work. diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index f62bb056249..64c1fb6d6b7 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -20,6 +20,10 @@ save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS" LIBS="$LIBS $ZLIB_LIBS" +case "$with_mysqld_ldflags " in + *"-all-static "*) + CPPFLAGS="$CPPFLAGS -static" +esac if test X"$with_server" = Xno then zlibsym=zlibVersion |