[Groonga-mysql-commit] mroonga/mroonga [fix-for-visual-studio] re-enable MYSQL_VERSION value for testing.

Back to archive index

Kouhei Sutou null+****@clear*****
Thu Oct 4 10:54:51 JST 2012


Kouhei Sutou	2011-09-28 18:14:38 +0900 (Wed, 28 Sep 2011)

  New Revision: 5d3a00f67ed2c29896d4b41f55650ee6b4d2ccfa
  https://github.com/mroonga/mroonga/commit/5d3a00f67ed2c29896d4b41f55650ee6b4d2ccfa

  Log:
    re-enable MYSQL_VERSION value for testing.

  Modified files:
    configure.ac

  Modified: configure.ac (+7 -1)
===================================================================
--- configure.ac    2011-09-28 18:00:29 +0900 (aec94f0)
+++ configure.ac    2011-09-28 18:14:38 +0900 (d94aff6)
@@ -75,7 +75,12 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
   fi
   MYSQL_CFLAGS="$MYSQL_CFLAGS $($ac_mysql_config --cflags)"
   MYSQL_INC="$MYSQL_INC $($ac_mysql_config --include)"
-  AC_SUBST(plugindir)
+  ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1,3`"
+  if test $ac_mysql_major_version -lt 55; then
+    MYSQL_VERSION="5.1"
+  else
+    MYSQL_VERSION="5.5"
+  fi
 ])
 
 AC_DEFUN([CONFIG_OPTION_MECAB],[
@@ -164,6 +169,7 @@ else
 fi
 AC_SUBST(MYSQL_INC)
 AC_SUBST(MYSQL_CFLAGS)
+AC_SUBST(MYSQL_VERSION)
 AC_SUBST(plugindir)
 CONFIG_OPTION_MECAB
 CONFIG_OPTION_GROONGA
-------------- next part --------------
HTML����������������������������...
下載 



More information about the Groonga-mysql-commit mailing list
Back to archive index