Tetsuro IKEDA
null+****@clear*****
Thu Oct 4 10:18:44 JST 2012
Tetsuro IKEDA 2009-06-02 15:48:48 +0900 (Tue, 02 Jun 2009) New Revision: e234fe9326ec7b8282ee4232e2cea58ef51e9a91 https://github.com/mroonga/mroonga/commit/e234fe9326ec7b8282ee4232e2cea58ef51e9a91 Log: mysql built-in build and standalone build (fix issue and upgrade) Modified files: Makefile.am configure.ac plug.in Modified: Makefile.am (+32 -6) =================================================================== --- Makefile.am 2009-06-02 11:54:28 +0900 (16fdcf6) +++ Makefile.am 2009-06-02 15:48:48 +0900 (2e33c8a) @@ -1,9 +1,35 @@ -lib_LTLIBRARIES = libmroonga.la - -AM_CPPFLAGS = $(MYSQL_INC) $(GROONGA_INCLUDES) $(MECAB_INCLUDES) -save-temps +AM_CPPFLAGS = $(MYSQL_INC) $(GROONGA_INCLUDES) $(MECAB_INCLUDES) AM_INCLUDES = -l. -l.. -libmroonga_la_SOURCES = ha_groonga.cc -libmroonga_la_LDFLAGS = -module $(GROONGA_LIBS) $(MECAB_LIBS) -libmroonga_la_CXXFLAGS = -DMYSQL_DYNAMIC_PLUGIN +MYSQLDATAdir = $(localstatedir) +MYSQLSHAREdir = $(pkgdatadir) +MYSQLBASEdir = $(prefix) +MYSQLLIBdir = $(pkglibdir) +pkgplugindir = $(pkglibdir)/plugin + +WRAPLIBS = + +LDADD = + +DEFS = @DEFS@ + noinst_HEADERS = mroonga.h ha_groonga.h + +lib_LTLIBRARIES = libmroonga.la +#pkgplugin_LTLIBRARIES = @plugin_mroonga_shared_target@ +libmroonga_la_LDFLAGS = -module -rpath $(pkgplugindir) $(GROONGA_LIBS) $(MECAB_LIBS) +libmroonga_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +libmroonga_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +libmroonga_la_SOURCES = ha_groonga.cc ha_groonga.h mroonga.h + +lib_LIBRARIES = libmroonga.a +#EXTRA_LIBRARIES = libmroonga.a +#noinst_LIBRARIES = @plugin_mroonga_static_target@ +libmroonga_a_LDFLANGS = $(GROONGA_LIBS) $(MECAB_LIBS) +libmroonga_a_CXXFLAGS = $(AM_CFLAGS) +libmroonga_a_CFLAGS = $(AM_CFLAGS) +libmroonga_a_SOURCES = ha_groonga.cc + +EXTRA_DIST = plug.in +# Don't update the files from bitkeeper +%::SCCS/s.% \ No newline at end of file Modified: configure.ac (+4 -0) =================================================================== --- configure.ac 2009-06-02 11:54:28 +0900 (ae86aee) +++ configure.ac 2009-06-02 15:48:48 +0900 (f9b1e81) @@ -127,9 +127,13 @@ AC_DEFUN([CONFIG_OPTION_GROONGA],[ AC_SUBST([GROONGA_LIBS]) ]) + CONFIG_OPTION_PLUGINS if test "$standalone_build" = "yes";then CONFIG_OPTION_MYSQL +else + MYSQL_INC="-I../../sql -I../../include -I../../regex -I../.." + AC_SUBST(MYSQL_INC) fi CONFIG_OPTION_MECAB CONFIG_OPTION_GROONGA Modified: plug.in (+1 -1) =================================================================== --- plug.in 2009-06-02 11:54:28 +0900 (e91bc3c) +++ plug.in 2009-06-02 15:48:48 +0900 (2adc49c) @@ -3,4 +3,4 @@ MYSQL_STORAGE_ENGINE(mroonga,,[Mroonga Storage Engine], [max,max-no-ndb]) MYSQL_PLUGIN_DIRECTORY(mroonga, [storage/mroonga]) MYSQL_PLUGIN_STATIC(mroonga, [libmroonga.a]) -MYSQL_PLUGIN_DYNAMIC(mroonga, [ha_mroonga.la]) +MYSQL_PLUGIN_DYNAMIC(mroonga, [libmroonga.la]) -------------- next part -------------- HTML����������������������������...Download