diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 6d2148300de..ed253b9a8e2 100644 --- a/configure.in +++ b/configure.in @@ -12,8 +12,12 @@ dnl 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.5-MariaDB], [], [mysql]) +dnl +dnl When merging new MySQL releases, update the version number to match the +dnl MySQL version number. +dnl +dnl Note: the following line must be parseable by win/configure.js:GetVersion() +AC_INIT([MariaDB Server], [5.3.0-MariaDB-alpha], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM @@ -870,6 +874,7 @@ AC_CHECK_HEADERS([xfs/xfs.h]) #-------------------------------------------------------------------- AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) +AC_CHECK_FUNCS(log2) AC_CHECK_LIB(nsl_r, gethostbyname_r, [], AC_CHECK_LIB(nsl, gethostbyname_r)) |