Kouhei Sutou
null+****@clear*****
Mon Mar 25 22:38:12 JST 2013
Kouhei Sutou 2013-03-25 22:38:12 +0900 (Mon, 25 Mar 2013) New Revision: a4c4470c8549a304d9148f07e1c8e62a7fc389b1 https://github.com/mroonga/mroonga/commit/a4c4470c8549a304d9148f07e1c8e62a7fc389b1 Message: Support only plugin build in configure based build system Bundled build should use CMake based build system. Modified files: Makefile.am configure.ac Modified: Makefile.am (+0 -6) =================================================================== --- Makefile.am 2013-03-25 22:34:40 +0900 (20a1512) +++ Makefile.am 2013-03-25 22:38:12 +0900 (71edc34) @@ -29,12 +29,6 @@ ha_groonga_la_CFLAGS = $(dynamic_plugin_cflags) -DMRN_USE_DEPRECATED_NAME ha_groonga_la_SOURCES = $(sources) ha_groonga_la_LIBADD = $(libraries) -plugin_LIBRARIES = libmroonga.a -libmroonga_a_CXXFLAGS = $(AM_CXXFLAGS) $(MYSQL_CFLAGS) -libmroonga_a_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS) -libmroonga_a_SOURCES = $(sources) -libmroonga_a_LIBADD = $(libraries) - SUBDIRS = \ build \ lib \ Modified: configure.ac (+2 -23) =================================================================== --- configure.ac 2013-03-25 22:34:40 +0900 (f364d33) +++ configure.ac 2013-03-25 22:38:12 +0900 (345e2a4) @@ -81,21 +81,6 @@ if test "$GCC" = "yes"; then CHECK_BUILD_FLAG([-Wno-deprecated]) fi -standalone_build= - -AC_DEFUN([CONFIG_OPTION_PLUGINS], - AC_MSG_CHECKING([standalone build]) - AC_ARG_WITH([plugins],, - [ - standalone_build="no" - AC_MSG_RESULT([no]) - ], - [ - standalone_build="yes" - AC_MSG_RESULT([yes]) - ]) -) - AC_DEFUN([CONFIG_OPTION_MYSQL],[ AC_MSG_CHECKING([mysql source]) @@ -118,7 +103,7 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ AC_MSG_ERROR([invalid MySQL source directory]) fi ], - [AC_MSG_ERROR([--with-mysql-source=PATH is required for standalone build])] + [AC_MSG_ERROR([--with-mysql-source=PATH is required])] ) MYSQL_SOURCE_DIR="$ac_mysql_source_dir" AC_SUBST(MYSQL_SOURCE_DIR) @@ -245,13 +230,7 @@ if test "$with_valgrind" != "no"; then CXXFLAGS="-DHAVE_valgrind $CXXFLAGS" fi -CONFIG_OPTION_PLUGINS -if test "$standalone_build" = "yes"; then - CONFIG_OPTION_MYSQL -else - MYSQL_INCLUDES="-I../../sql -I../../include -I../../regex -I../.." - plugindir="\$(pkglibdir)/plugin" -fi +CONFIG_OPTION_MYSQL AC_SUBST(plugindir) CONFIG_OPTION_GROONGA CONFIG_OPTION_GROONGA_NORMALIZER_MYSQL -------------- next part -------------- HTML����������������������������...Download
