Merge branch 'master' of github.com:mroonga/mroonga

.gitignore

@@ -28,7 +28,7 @@ cscope.out
 /missing
 /stamp-h1
 /src/scratch
-/libgroonga.a
+/libmroonga.a
 /packages/rpm/*/*.spec
 /packages/yum/fedora/
 /packages/yum/centos/
@@ -43,8 +43,8 @@ cscope.out
 /doc/sphinx/
 /misc/
 /tmp-doc/
-/test/sql/suite/groonga_storage/r/information_schema.result
-/test/sql/suite/groonga_storage/r/variables.result
+/test/sql/suite/mroonga_storage/r/information_schema.result
+/test/sql/suite/mroonga_storage/r/variables.result
 /mrn_version.h
 /mroonga-*.tar.gz
 /packages/mroonga-*.tar.gz

AUTHORS

@@ -0,0 +1,7 @@
+Active developers:
+* Kentoku SHIBA
+* Kouhei Sutou
+
+Inactive developers:
+* Tetsuro IKEDA: The original author: Active
+* Yoshinori Matsunobu: The original author of information schema

Makefile.am

@@ -18,24 +18,36 @@ sources =					\
 	mrn_sys.c				\
 	mrn_table.cc
 
-plugin_LTLIBRARIES     = ha_groonga.la
-ha_groonga_la_LDFLAGS  = -module $(GROONGA_LIBS)
-ha_groonga_la_CXXFLAGS = $(AM_CXXFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_groonga_la_CFLAGS   = $(AM_CFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+dynamic_plugin_ldflags  = -module $(GROONGA_LIBS)
+dynamic_plugin_cxxflags = $(AM_CXXFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+dynamic_plugin_cflags   = $(AM_CFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+
+plugin_LTLIBRARIES     = ha_mroonga.la
+ha_mroonga_la_LDFLAGS  = $(dynamic_plugin_ldflags)
+ha_mroonga_la_CXXFLAGS = $(dynamic_plugin_cxxflags)
+ha_mroonga_la_CFLAGS   = $(dynamic_plugin_cflags)
+ha_mroonga_la_SOURCES  = $(sources)
+
+plugin_LTLIBRARIES    += ha_groonga.la
+ha_groonga_la_LDFLAGS  = $(dynamic_plugin_ldflags)
+ha_groonga_la_CXXFLAGS = $(dynamic_plugin_cxxflags) -DMRN_USE_DEPRECATED_NAME
+ha_groonga_la_CFLAGS   = $(dynamic_plugin_cflags) -DMRN_USE_DEPRECATED_NAME
 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         = libmroonga.a
+libmroonga_a_CXXFLAGS    = $(AM_CXXFLAGS) $(MYSQL_CFLAGS)
+libmroonga_a_CFLAGS      = $(AM_CFLAGS) $(MYSQL_CFLAGS)
+libmroonga_a_SOURCES     = $(sources)
 
 SUBDIRS =					\
 	test					\
 	doc					\
 	tools					\
 	packages
 
-EXTRA_DIST = plug.in
+EXTRA_DIST =					\
+	AUTHORS					\
+	plug.in
 
 installcheck-local: install
 	test/run-sql-test.sh

configure.ac

@@ -1,6 +1,6 @@
 m4_define([mrn_version_major], [1])
-m4_define([mrn_version_minor], [1])
-m4_define([mrn_version_micro], [1])
+m4_define([mrn_version_minor], [2])
+m4_define([mrn_version_micro], [0])
 m4_define([mrn_version],
           [mrn_version_major.mrn_version_minor[]mrn_version_micro])
 
@@ -288,12 +288,12 @@ AC_CONFIG_FILES([
   test/unit/Makefile
   test/sql/Makefile
   test/sql/include/Makefile
-  test/sql/suite/groonga_storage/Makefile
-  test/sql/suite/groonga_storage/r/Makefile
-  test/sql/suite/groonga_storage/t/Makefile
-  test/sql/suite/groonga_wrapper/Makefile
-  test/sql/suite/groonga_wrapper/r/Makefile
-  test/sql/suite/groonga_wrapper/t/Makefile
+  test/sql/suite/mroonga_storage/Makefile
+  test/sql/suite/mroonga_storage/r/Makefile
+  test/sql/suite/mroonga_storage/t/Makefile
+  test/sql/suite/mroonga_wrapper/Makefile
+  test/sql/suite/mroonga_wrapper/r/Makefile
+  test/sql/suite/mroonga_wrapper/t/Makefile
   packages/Makefile
   packages/rpm/Makefile
   packages/rpm/centos/Makefile
@@ -310,8 +310,8 @@ AC_CONFIG_FILES([
 ])
 AC_OUTPUT([
   mrn_version.h
-  test/sql/suite/groonga_storage/r/information_schema.result
-  test/sql/suite/groonga_storage/r/variables.result
+  test/sql/suite/mroonga_storage/r/information_schema.result
+  test/sql/suite/mroonga_storage/r/variables.result
   packages/rpm/centos/mysql-mroonga.spec
   packages/rpm/fedora/mysql-mroonga.spec
 ])