diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
| commit | 5dec570d7c1e2a39b67503a90d2d7905ac4dbb44 (patch) | |
| tree | d206f4c8848a50899d8d0656e8c8212189365ace /configure.in | |
| parent | 5138bf4238d4a8850ee364a3adf10dc2687af67c (diff) | |
| parent | 027e34e13b8d0baed51e26be8d4ffd86d9b3b041 (diff) | |
| download | mariadb-git-5dec570d7c1e2a39b67503a90d2d7905ac4dbb44.tar.gz | |
5.1 -> 5.2 merge
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 2fabe562698..04faa551d1b 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,7 @@ dnl When changing the major version number please also check the switch dnl statement in mysqlbinlog::check_master_version(). You may also need dnl to update version.c in ndb. -AC_INIT([MariaDB Server], [5.2.14-MariaDB], [], [mysql]) +AC_INIT([MariaDB Server], [5.2.15-MariaDB], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM @@ -23,7 +23,7 @@ AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE([1.9 tar-ustar]) AC_PROG_LIBTOOL -AM_CONFIG_HEADER([include/config.h]) +AC_CONFIG_HEADERS([include/config.h]) # Request support for automake silent-rules if available. # Default to verbose output. One can use the configure-time @@ -275,6 +275,31 @@ AC_SUBST(LIBTOOL)dnl AC_SUBST(NM)dnl +############################################################################## +# In automake 1.12, the extension on generated yacc/bison header files changed +############################################################################## + +YACC_HEXT="h" +MAKEFILE_1ST=`head -1 "$srcdir/Makefile.in"` +AMAKE_MAJOR=`expr "$MAKEFILE_1ST" : '.*generated by automake \([[0-9]]*\).*'` +if test $? -eq "0" ; then + if test "$AMAKE_MAJOR" -gt "1" ; then + YACC_HEXT="hh" + CXXFLAGS="$CXXFLAGS -DYACC_HEXT_HH" + elif test "$AMAKE_MAJOR" -eq "1" ; then + AMAKE_MINOR=`expr "$MAKEFILE_1ST" : '.*generated by automake 1.\([[0-9]]*\).*'` + if test $? -eq "0" ; then + if test "$AMAKE_MINOR" -ge "12" ; then + YACC_HEXT="hh" + CXXFLAGS="$CXXFLAGS -DYACC_HEXT_HH" + fi + fi + fi +fi +AC_SUBST(YACC_HEXT) + +############################################################################## + # NM= "$NM -X64" #archive_expsym_cmds= `echo "$archive_expsym_cmds" | sed -e '/"$(CC)"//'` #archive_expsym_cmds= "$CC -q64 $archive_expsym_cmds" |