svnno****@sourc*****
svnno****@sourc*****
2008年 12月 1日 (月) 20:00:15 JST
Revision: 172
http://svn.sourceforge.jp/view?root=tritonn&view=rev&rev=172
Author: mir
Date: 2008-12-01 20:00:15 +0900 (Mon, 01 Dec 2008)
Log Message:
-----------
added version check for libsenna in configure.
Modified Paths:
--------------
tags/tritonn-1.0.12-mysql-5.0.67/configure
tags/tritonn-1.0.12-mysql-5.0.67/configure.in
-------------- next part --------------
Modified: tags/tritonn-1.0.12-mysql-5.0.67/configure
===================================================================
--- tags/tritonn-1.0.12-mysql-5.0.67/configure 2008-12-01 08:35:27 UTC (rev 171)
+++ tags/tritonn-1.0.12-mysql-5.0.67/configure 2008-12-01 11:00:15 UTC (rev 172)
@@ -23141,6 +23141,17 @@
# For senna
+get_version_id()
+{
+ _VERSION="$1"
+ _NO_DASH_VERSION=`echo $_VERSION | sed -e "s|-.*$||"`
+ _NUMERIC_VERSION=`echo $_NO_DASH_VERSION | sed -e "s|[a-z][a-z0-9]*$||"`
+ _BASE_VERSION=`echo $_NUMERIC_VERSION | sed -e "s|\.[^.]*$||"`
+ _VERSION_ID=`echo $_NUMERIC_VERSION | \
+ awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'`
+ echo $_VERSION_ID
+}
+
MECAB_INCLUDES=
MECAB_LIBS=
@@ -23449,6 +23460,20 @@
fi
+ SENNA_MIN_VERSION_FOR_TRITONN="1.1.4"
+
+ SENNA_VERSION=`$SENNA_CFG --version`
+ SENNA_VERSION_ID=`get_version_id $SENNA_VERSION`
+ SENNA_MIN_REQ_ID=`get_version_id $SENNA_MIN_VERSION_FOR_TRITONN`
+
+ if test $SENNA_VERSION_ID -lt $SENNA_MIN_REQ_ID; then
+ { { echo "$as_me:$LINENO: error: Senna $SENNA_MIN_VERSION_FOR_TRITONN \
+or later is needed. Your senna is $SENNA_VERSION." >&5
+echo "$as_me: error: Senna $SENNA_MIN_VERSION_FOR_TRITONN \
+or later is needed. Your senna is $SENNA_VERSION." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
CPPFLAGS="${_CPPFLAGS}"
LIBS="${_LIBS}"
;;
Modified: tags/tritonn-1.0.12-mysql-5.0.67/configure.in
===================================================================
--- tags/tritonn-1.0.12-mysql-5.0.67/configure.in 2008-12-01 08:35:27 UTC (rev 171)
+++ tags/tritonn-1.0.12-mysql-5.0.67/configure.in 2008-12-01 11:00:15 UTC (rev 172)
@@ -827,6 +827,17 @@
AC_TYPE_SIZE_T
# For senna
+get_version_id()
+{
+ _VERSION="$1"
+ _NO_DASH_VERSION=`echo $_VERSION | sed -e "s|-.*$||"`
+ _NUMERIC_VERSION=`echo $_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`
+ _BASE_VERSION=`echo $_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
+ _VERSION_ID=`echo $_NUMERIC_VERSION | \
+ awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'`
+ echo $_VERSION_ID
+}
+
MECAB_INCLUDES=
MECAB_LIBS=
@@ -922,6 +933,17 @@
AC_MSG_ERROR([Could not find libsenna. Check your Senna installation.])
])
+ SENNA_MIN_VERSION_FOR_TRITONN="1.1.4"
+
+ SENNA_VERSION=`$SENNA_CFG --version`
+ SENNA_VERSION_ID=`get_version_id $SENNA_VERSION`
+ SENNA_MIN_REQ_ID=`get_version_id $SENNA_MIN_VERSION_FOR_TRITONN`
+
+ if test $SENNA_VERSION_ID -lt $SENNA_MIN_REQ_ID; then
+ AC_MSG_ERROR([Senna $SENNA_MIN_VERSION_FOR_TRITONN \
+or later is needed. Your senna is $SENNA_VERSION.])
+ fi
+
CPPFLAGS="${_CPPFLAGS}"
LIBS="${_LIBS}"
;;