configure script recognizes mysql major version.

mroonga · Nov 4, 2010 · 6825868 · 6825868
1 parent 6009dee
commit 6825868
Show file tree

Hide file tree

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

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