--- trunk/monitor-core/srclib/confuse/configure.ac	2006/12/31 11:06:27	702
+++ trunk/monitor-core/srclib/confuse/configure.ac	2006/12/31 21:40:09	707
@@ -19,7 +19,8 @@
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.14.1)
 
-AM_PATH_CHECK(, [AC_SUBST([check_confuse], ['check_confuse${EXTEXT}'])], [AC_WARN([Check not found, tests will not be built])])
+AM_PATH_CHECK(, [have_check="yes"], [AC_MSG_WARN([Check not found, tests will not be built])])
+AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
 # Checks for header files.
 AC_HEADER_STDC
--- trunk/monitor-core/srclib/confuse/tests/Makefile.am	2006/12/31 11:03:09	701
+++ trunk/monitor-core/srclib/confuse/tests/Makefile.am	2006/12/31 21:40:09	707
@@ -1,3 +1,5 @@
+if HAVE_CHECK
+
 TESTS=check_confuse
 
 check_PROGRAMS=check_confuse
@@ -5,6 +7,12 @@
 					  suite_func.c
 check_confuse_CPPFLAGS=-I$(top_srcdir)/src @CHECK_CFLAGS@
 check_confuse_LDADD=-L../src/ @CHECK_LIBS@ ../src/libconfuse.la $(LTLIBINTL)
+
+else
+
+TESTS=
+
+endif
+
 EXTRA_DIST=a.conf b.conf
 CLEANFILES=*~ \#*\#
-