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

mroonga · Nov 25, 2011 · 775b791 · 775b791
2 parents f0406a3 + 2e169b2
commit 775b791
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/configure.ac b/configure.ac
@@ -18,10 +18,6 @@ AC_SUBST([MRN_VERSION_MICRO])
 MRN_VERSION_IN_HEX=`printf "0x%02x%02x" mrn_version_major mrn_version_minor[]mrn_version_micro`
 AC_SUBST([MRN_VERSION_IN_HEX])
 
-AC_DEFINE_UNQUOTED(MRN_PACKAGE_STRING,
-                   ["$PACKAGE_STRING"],
-                   [Define to the full name and version of this package.])
-
 AC_C_BIGENDIAN
 AC_PROG_CC
 AC_PROG_CXX

diff --git a/doc/source/news.rst b/doc/source/news.rst
@@ -16,7 +16,6 @@ Improvements
 * add groonga_libgroonga_version and groonga_version variables #1158.
 * information_schema.plugins.plugin_version returns mroonga's version #1157.
 * FLUSH STATUS flushes groonga_* status variables #1166.
-* support ALTER TABLE #1168.
 * support TRUNCATE TABLE #1151.
 * support MariaDB 5.2.9.
 * support MariaDB 5.3.2-beta.

diff --git a/mrn_version.h.in b/mrn_version.h.in
@@ -34,4 +34,7 @@
 /* Define mroonga micro version */
 #define MRN_VERSION_MICRO @MRN_VERSION_MICRO@
 
+/* Define to the full name and version of this package. */
+#define MRN_PACKAGE_STRING "@PACKAGE_STRING@"
+
 #endif /* _mrn_version_h */