Tetsuro IKEDA
null+****@clear*****
Thu Oct 4 10:28:46 JST 2012
Tetsuro IKEDA 2010-11-04 17:16:48 +0900 (Thu, 04 Nov 2010) New Revision: 68258681ffa85f53f4a8077f7c2c74025e7cd53b https://github.com/mroonga/mroonga/commit/68258681ffa85f53f4a8077f7c2c74025e7cd53b Log: configure script recognizes mysql major version. Modified files: Makefile.am configure.ac Modified: Makefile.am (+1 -2) =================================================================== --- Makefile.am 2010-11-02 19:41:08 +0900 (b3187cc) +++ Makefile.am 2010-11-04 17:16:48 +0900 (bf074c4) @@ -1,7 +1,6 @@ AUTOMAKE_OPTIONS = 1.9.7 -AM_CPPFLAGS = $(MYSQL_INC) $(GROONGA_CFLAGS) $(MECAB_INCLUDES) -AM_INCLUDES = -l. -l.. +AM_CPPFLAGS = $(MYSQL_INC) $(GROONGA_CFLAGS) $(MECAB_INCLUDES) $(MYSQL51) ACLOCAL_AMFLAGS = $$ACLOCAL_ARGS noinst_HEADERS = mrnsys.h ha_mroonga.h Modified: configure.ac (+5 -0) =================================================================== --- configure.ac 2010-11-02 19:41:08 +0900 (e2b3569) +++ configure.ac 2010-11-04 17:16:48 +0900 (57bd6f2) @@ -71,6 +71,11 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[ AC_MSG_ERROR([failed to run "$ac_mysql_config": $plugindir]) fi 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" = "5.1"; then + MYSQL51="-DMYSQL51" + AC_SUBST(MYSQL51) + fi AC_SUBST(plugindir) ]) -------------- next part -------------- HTML����������������������������...다운로드
