null+****@clear*****
null+****@clear*****
2012年 4月 12日 (木) 15:56:40 JST
Kouhei Sutou 2012-04-12 15:56:40 +0900 (Thu, 12 Apr 2012)
New Revision: e18030071913f66d207ec5fdd55b83090a685c10
Log:
Define GRN_VERSION in config.h
Modified files:
CMakeLists.txt
config.h.cmake
configure.ac
lib/Makefile.am
Modified: CMakeLists.txt (+0 -1)
===================================================================
--- CMakeLists.txt 2012-04-12 15:55:26 +0900 (988449b)
+++ CMakeLists.txt 2012-04-12 15:56:40 +0900 (3c02b5b)
@@ -26,7 +26,6 @@ set(GRN_LOG_PATH
add_definitions(
-DHAVE_CONFIG_H
- -DGROONGA_VERSION=\"${GROONGA_VERSION}\"
)
include_directories(
Modified: config.h.cmake (+1 -0)
===================================================================
--- config.h.cmake 2012-04-12 15:55:26 +0900 (b59979f)
+++ config.h.cmake 2012-04-12 15:56:40 +0900 (0e959f2)
@@ -6,6 +6,7 @@
#define GRN_CONFIG_PATH "${GRN_CONFIG_PATH}"
#define GRN_LOG_PATH "${GRN_LOG_PATH}"
+#define GRN_VERSION "${GRN_VERSION}"
#define GRN_DEFAULT_DB_KEY "${GRN_DEFAULT_DB_KEY}"
#define GRN_DEFAULT_ENCODING "${GRN_DEFAULT_ENCODING}"
Modified: configure.ac (+1 -0)
===================================================================
--- configure.ac 2012-04-12 15:55:26 +0900 (3198825)
+++ configure.ac 2012-04-12 15:56:40 +0900 (cbf2f3a)
@@ -190,6 +190,7 @@ AC_SUBST(GRN_DLL_FILENAME)
if test "$srcdir/version.sh"; then
source "$srcdir/version.sh"
AC_SUBST(GRN_VERSION)
+ AC_DEFINE_UNQUOTED(GRN_VERSION, ["$GRN_VERSION"], [groonga version])
fi
AC_CONFIG_FILES([
Modified: lib/Makefile.am (+1 -1)
===================================================================
--- lib/Makefile.am 2012-04-12 15:55:26 +0900 (707b888)
+++ lib/Makefile.am 2012-04-12 15:56:40 +0900 (f445135)
@@ -9,7 +9,7 @@ AM_CFLAGS = \
$(GRN_CFLAGS) \
$(MESSAGE_PACK_CFLAGS)
DEFAULT_INCLUDES = -I$(top_builddir) -I$(top_srcdir)/include
-DEFS += -D_REENTRANT -DGRN_VERSION=\"$(GRN_VERSION)\" $(GRN_DEFS)
+DEFS += -D_REENTRANT $(GRN_DEFS)
libgroonga_la_SOURCES = \
com.c \