null+****@clear*****
null+****@clear*****
2011年 4月 8日 (金) 19:27:20 JST
Kouhei Sutou 2011-04-08 10:27:20 +0000 (Fri, 08 Apr 2011)
New Revision: db51b180297edff04104108e573a3f94a5dbbdee
Log:
MYSQL51 -> MYSQL_VERSION_CFLAGS.
Modified files:
Makefile.am
configure.ac
Modified: Makefile.am (+1 -1)
===================================================================
--- Makefile.am 2011-04-02 09:22:24 +0000 (6071906)
+++ Makefile.am 2011-04-08 10:27:20 +0000 (1cbdd49)
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = 1.9.7
-AM_CPPFLAGS = $(MYSQL_INC) $(GROONGA_CFLAGS) $(MECAB_INCLUDES) $(MYSQL51)
+AM_CPPFLAGS = $(MYSQL_INC) $(GROONGA_CFLAGS) $(MECAB_INCLUDES) $(MYSQL_VERSION_CFLAGS)
ACLOCAL_AMFLAGS = $$ACLOCAL_ARGS
noinst_HEADERS = mrnsys.h ha_mroonga.h
Modified: configure.ac (+6 -2)
===================================================================
--- configure.ac 2011-04-02 09:22:24 +0000 (788e69a)
+++ configure.ac 2011-04-08 10:27:20 +0000 (926ae06)
@@ -73,9 +73,13 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
MYSQL_INC="$MYSQL_INC $($ac_mysql_config --include)"
ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1,3`"
if test $ac_mysql_major_version -lt 55; then
- MYSQL51="-DMYSQL51"
- AC_SUBST(MYSQL51)
+ MYSQL_VERSION_CFLAGS="-DMYSQL51"
+ AC_SUBST(MYSQL_VERSION_CFLAGS)
+ MYSQL_VERSION="5.1"
+ else
+ MYSQL_VERSION="5.5"
fi
+ AC_SUBST(MYSQL_VERSION)
AC_SUBST(plugindir)
])