don't require Cutter.

mroonga · Aug 18, 2010 · bb8a62a · bb8a62a
1 parent 8ad57fd
commit bb8a62a
Show file tree

Hide file tree

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

diff --git a/configure.ac b/configure.ac
@@ -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
diff --git a/test/Makefile.am b/test/Makefile.am
@@ -1,7 +1,9 @@
 SUBDIRS = unit
 
+if WITH_CUTTER
 TESTS = run-unit-test.sh
 TESTS_ENVIRONMENT = CUTTER="$(CUTTER)"
+endif
 
 echo-cutter:
 	echo $(CUTTER)
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
@@ -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..