null+****@clear*****
null+****@clear*****
2011年 12月 28日 (水) 16:48:49 JST
Kazuhiko 2011-12-28 16:48:49 +0900 (Wed, 28 Dec 2011)
New Revision: 31ec70748a8eab75a5c7f97410fef060491f0298
Log:
revert renaming static library because of the conflict with groonga's static library.
Modified files:
Makefile.am
plug.in
Modified: Makefile.am (+4 -4)
===================================================================
--- Makefile.am 2011-12-28 16:45:58 +0900 (3eeb22c)
+++ Makefile.am 2011-12-28 16:48:49 +0900 (faf0d11)
@@ -24,10 +24,10 @@ ha_groonga_la_CXXFLAGS = $(AM_CXXFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_groonga_la_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_groonga_la_SOURCES = $(sources)
-plugin_LIBRARIES = libgroonga.a
-libgroonga_a_CXXFLAGS = $(AM_CXXFLAGS) $(MYSQL_CFLAGS)
-libgroonga_a_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS)
-libgroonga_a_SOURCES = $(sources)
+plugin_LIBRARIES = libha_groonga.a
+libha_groonga_a_CXXFLAGS = $(AM_CXXFLAGS) $(MYSQL_CFLAGS)
+libha_groonga_a_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS)
+libha_groonga_a_SOURCES = $(sources)
SUBDIRS = \
test \
Modified: plug.in (+1 -1)
===================================================================
--- plug.in 2011-12-28 16:45:58 +0900 (19442ab)
+++ plug.in 2011-12-28 16:48:49 +0900 (91c9ea9)
@@ -2,5 +2,5 @@ MYSQL_STORAGE_ENGINE(groonga,,[groonga storage engine],
[Fulltext search, column base],
[max,max-no-ndb])
MYSQL_PLUGIN_DIRECTORY(groonga, [storage/groonga-storage-engine])
-MYSQL_PLUGIN_STATIC(groonga, [libgroonga.a])
+MYSQL_PLUGIN_STATIC(groonga, [libha_groonga.a])
MYSQL_PLUGIN_DYNAMIC(groonga, [ha_groonga.la])