null+****@clear*****
null+****@clear*****
2010年 8月 18日 (水) 17:31:49 JST
Kouhei Sutou 2010-08-18 08:31:49 +0000 (Wed, 18 Aug 2010)
New Revision: bb8a62a4aa6b6e9d94c47980fdc6cd21a29bef1b
Log:
don't require Cutter.
Modified files:
Makefile.am
configure.ac
test/Makefile.am
test/unit/Makefile.am
Modified: Makefile.am (+1 -1)
===================================================================
--- Makefile.am 2010-08-13 10:00:27 +0000 (6ac3b39)
+++ Makefile.am 2010-08-18 08:31:49 +0000 (e302ff1)
@@ -25,7 +25,7 @@ libgroonga_storage_engine_a_CXXFLAGS = $(AM_CFLAGS)
libgroonga_storage_engine_a_CFLAGS = $(AM_CFLAGS)
libgroonga_storage_engine_a_SOURCES = ha_mroonga.cc mrnsys.c
-#SUBDIRS = test
+SUBDIRS = test
EXTRA_DIST = plug.in
Modified: configure.ac (+9 -2)
===================================================================
--- configure.ac 2010-08-13 10:00:27 +0000 (5b1fef4)
+++ configure.ac 2010-08-18 08:31:49 +0000 (4d40ae9)
@@ -161,13 +161,20 @@ fi
CONFIG_OPTION_MECAB
CONFIG_OPTION_GROONGA
-#AC_CHECK_CUTTER
-#AC_CHECK_GCUTTER
+# check Cutter with GLib support if available
+REQUIRED_MINIMUM_CUTTER_VERSION=1.1.3
+m4_ifdef([AC_CHECK_GCUTTER], [
+AC_CHECK_GCUTTER(>= $REQUIRED_MINIMUM_CUTTER_VERSION)
+],
+[ac_cv_use_cutter="no"])
+AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"])
CFLAGS="$CFLAGS -Werror"
CXXFLAGS="$CXXFLAGS -Werror -fno-implicit-templates -fno-exceptions -fno-rtti -felide-constructors"
AC_CONFIG_FILES([
Makefile
+ test/Makefile
+ test/unit/Makefile
])
AC_OUTPUT
Modified: test/Makefile.am (+2 -0)
===================================================================
--- test/Makefile.am 2010-08-13 10:00:27 +0000 (fe9e248)
+++ test/Makefile.am 2010-08-18 08:31:49 +0000 (9f47fc4)
@@ -1,7 +1,9 @@
SUBDIRS = unit
+if WITH_CUTTER
TESTS = run-unit-test.sh
TESTS_ENVIRONMENT = CUTTER="$(CUTTER)"
+endif
echo-cutter:
echo $(CUTTER)
Modified: test/unit/Makefile.am (+2 -0)
===================================================================
--- test/unit/Makefile.am 2010-08-13 10:00:27 +0000 (459875b)
+++ test/unit/Makefile.am 2010-08-18 08:31:49 +0000 (7a5b00c)
@@ -1,4 +1,6 @@
+if WITH_CUTTER
noinst_LTLIBRARIES = test_mrnsys.la
+endif
AM_CPPFLAGS = $(GROONGA_INCLUDES) $(MECAB_INCLUDES) $(CUTTER_CFLAGS) $(GCUTTER_CFLAGS)
AM_INCLUDES = -l. -l..