Add MRN_ prefix

mroonga · Mar 20, 2012 · 07ed257 · 07ed257
1 parent 1c83d78
commit 07ed257
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -8,9 +8,11 @@ AC_INIT([mroonga], [mrn_version], [ikdttr@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign tar-pax])
 
+MRN_VERSION=mrn_version
 MRN_VERSION_MAJOR=mrn_version_major
 MRN_VERSION_MINOR=mrn_version_minor
 MRN_VERSION_MICRO=mrn_version_micro
+AC_SUBST([MRN_VERSION])
 AC_SUBST([MRN_VERSION_MAJOR])
 AC_SUBST([MRN_VERSION_MINOR])
 AC_SUBST([MRN_VERSION_MICRO])
@@ -21,6 +23,9 @@ AC_SUBST([MRN_VERSION_IN_HEX])
 MRN_PLUGIN_VERSION=`printf "%d.%d" mrn_version_major mrn_version_minor[]mrn_version_micro`
 AC_SUBST([MRN_PLUGIN_VERSION])
 
+MRN_PACKAGE_STRING="$PACKAGE_STRING"
+AC_SUBST([MRN_PACKAGE_STRING])
+
 AC_C_BIGENDIAN
 AC_PROG_CC
 AC_PROG_CXX

diff --git a/mrn_version.h.in b/mrn_version.h.in
@@ -20,7 +20,7 @@
 #define _mrn_version_h
 
 /* Define mroonga version in string */
-#define MRN_VERSION "@VERSION@"
+#define MRN_VERSION "@MRN_VERSION@"
 
 /* Define mroonga version in hex */
 #define MRN_VERSION_IN_HEX @MRN_VERSION_IN_HEX@
@@ -35,6 +35,6 @@
 #define MRN_VERSION_MICRO @MRN_VERSION_MICRO@
 
 /* Define to the full name and version of this package. */
-#define MRN_PACKAGE_STRING "@PACKAGE_STRING@"
+#define MRN_PACKAGE_STRING "@MRN_PACKAGE_STRING@"
 
 #endif /* _mrn_version_h */