null+****@clear*****
null+****@clear*****
2012年 3月 20日 (火) 13:46:03 JST
Kouhei Sutou 2012-03-20 13:46:03 +0900 (Tue, 20 Mar 2012)
New Revision: 07ed2570ebc9ec2dfca2aba4d889c3a30a609aee
Log:
Add MRN_ prefix
Modified files:
configure.ac
mrn_version.h.in
Modified: configure.ac (+5 -0)
===================================================================
--- configure.ac 2012-03-19 18:56:53 +0900 (6098e02)
+++ configure.ac 2012-03-20 13:46:03 +0900 (15a0a28)
@@ -8,9 +8,11 @@ AC_INIT([mroonga], [mrn_version], [ikdtt****@gmail*****])
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
Modified: mrn_version.h.in (+2 -2)
===================================================================
--- mrn_version.h.in 2012-03-19 18:56:53 +0900 (456cb82)
+++ mrn_version.h.in 2012-03-20 13:46:03 +0900 (a6a773c)
@@ -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 */