diff options
Diffstat (limited to 'storage/mroonga/configure.ac')
| -rw-r--r-- | storage/mroonga/configure.ac | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/storage/mroonga/configure.ac b/storage/mroonga/configure.ac index 48312a44c8c..dc127c17838 100644 --- a/storage/mroonga/configure.ac +++ b/storage/mroonga/configure.ac @@ -174,12 +174,20 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_build_dir/include" MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir/sql" MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir/include" + if test -d "$ac_mysql_source_dir/extra/rapidjson"; then + mysql_rapidjson_include_dir="$ac_mysql_source_dir/extra/rapidjson/include" + MYSQL_INCLUDES="$MYSQL_INCLUDES -I$mysql_rapidjson_include_dir" + fi if test -d "$ac_mysql_source_dir/pcre"; then mysql_regex_include_dir="$ac_mysql_source_dir/pcre" else mysql_regex_include_dir="$ac_mysql_source_dir/regex" fi MYSQL_INCLUDES="$MYSQL_INCLUDES -I$mysql_regex_include_dir" + if test -d "$ac_mysql_source_dir/libbinlogevents"; then + MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir/libbinlogevents/export" + MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir/libbinlogevents/include" + fi MYSQL_INCLUDES="$MYSQL_INCLUDES -I$ac_mysql_source_dir" MYSQL_INCLUDES="$MYSQL_INCLUDES $($ac_mysql_config --include)" AC_SUBST(MYSQL_INCLUDES) @@ -187,8 +195,19 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ MYSQL_VERSION="$($ac_mysql_config --version)" AC_SUBST(MYSQL_VERSION) + MYSQL_MAJOR_MINOR_VERSION=["$(echo $MYSQL_VERSION | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*[a-z]*\)[.0-9a-z-]*$/\1.\2/')"] + + 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 5.1) MYSQL_LIBS="" @@ -447,7 +466,7 @@ AC_SUBST(DOCUMENT_VERSION) AC_SUBST(DOCUMENT_VERSION_FULL) CFLAGS="$CFLAGS" -CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti -felide-constructors" +CXXFLAGS="$CXXFLAGS $MYSQL_CXXFLAGS" AC_CONFIG_FILES([ Makefile @@ -461,7 +480,6 @@ AC_CONFIG_FILES([ packages/Makefile packages/rpm/Makefile packages/rpm/centos/Makefile - packages/rpm/fedora/Makefile packages/yum/Makefile packages/apt/Makefile packages/source/Makefile @@ -486,8 +504,7 @@ AC_OUTPUT([ packages/rpm/centos/mysql55-mroonga.spec packages/rpm/centos/mysql56-community-mroonga.spec packages/rpm/centos/mariadb-mroonga.spec - packages/rpm/fedora/mysql-mroonga.spec - packages/rpm/fedora/mariadb-mroonga.spec + packages/rpm/centos/percona-server-56-mroonga.spec packages/yum/env.sh data/install.sql ]) |