Kouhei Sutou
null+****@clear*****
Mon Mar 16 23:39:48 JST 2015
Kouhei Sutou 2015-03-16 23:39:48 +0900 (Mon, 16 Mar 2015) New Revision: 57821b5b9843762bf3d32dd59ff800ab000e4e47 https://github.com/mroonga/mroonga/commit/57821b5b9843762bf3d32dd59ff800ab000e4e47 Message: Don't enable RTTI and exception except MySQL 5.7 Modified files: configure.ac Modified: configure.ac (+11 -1) =================================================================== --- configure.ac 2015-03-16 23:36:10 +0900 (6aa888f) +++ configure.ac 2015-03-16 23:39:48 +0900 (14b9f46) @@ -195,6 +195,16 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ MYSQL_VERSION="$($ac_mysql_config --version)" AC_SUBST(MYSQL_VERSION) + MYSQL_CXXFLAGS="-fno-implicit-templates -felide-constructors" + case "$MYSQL_MAJOR_MINOR_VERSION" in + 5.7) + : + ;; + *) + MYSQL_CXXFLAGS="$MYSQL_CXXFLAGS -fno-exceptions -fno-rtti" + ;; + esac + if test "${with_libmysqlservices_compat}" = "no"; then MYSQL_MAJOR_MINOR_VERSION=["$(echo $MYSQL_VERSION | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*[a-z]*\)$/\1.\2/')"] case "$MYSQL_MAJOR_MINOR_VERSION" in @@ -455,7 +465,7 @@ AC_SUBST(DOCUMENT_VERSION) AC_SUBST(DOCUMENT_VERSION_FULL) CFLAGS="$CFLAGS" -CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -felide-constructors" +CXXFLAGS="$CXXFLAGS $MYSQL_CXXFLAGS" AC_CONFIG_FILES([ Makefile -------------- next part -------------- HTML����������������������������...Download
