diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 7fe92ad1467..60e34eeb9f5 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.0.19) +AM_INIT_AUTOMAKE(mysql, 5.0.20) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=19 +NDB_VERSION_BUILD=20 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? @@ -236,7 +236,7 @@ AC_PROG_INSTALL test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' # Not critical since the generated file is distributed -AC_PROG_YACC +AC_CHECK_PROGS(YACC, ['bison -y -p MYSQL']) AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf) AC_CHECK_PROG(DVIS, tex, manual.dvi) @@ -356,6 +356,9 @@ then # mysqld requires -fno-implicit-templates. # Disable exceptions as they seams to create problems with gcc and threads. # mysqld doesn't use run-time-type-checking, so we disable it. + # We should use -Wno-invalid-offsetof flag to disable some warnings from gcc + # regarding offset() usage in C++ which are done in a safe manner in the + # server CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti" AC_DEFINE([HAVE_EXPLICIT_TEMPLATE_INSTANTIATION], [1], [Defined by configure. Use explicit template instantiation.]) |