MYSQL51 -> MYSQL_VERSION_CFLAGS.

mroonga · Apr 8, 2011 · db51b18 · db51b18
1 parent 814ab95
commit db51b18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -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

diff --git a/configure.ac b/configure.ac
@@ -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)
 ])