--- configure.ac.orig	2006-01-30 02:01:10.000000000 -0600
+++ configure.ac	2006-01-30 02:04:10.000000000 -0600
@@ -194,15 +194,19 @@
 	AC_DEFINE(GALAGO_VA_COPY_AS_ARRAY, 1, ['va_lists' cannot be copied as values])
 fi
 
-
-dnl #
-dnl # Check for Check
-dnl #
-AM_PATH_CHECK(, [have_check="yes"],
-[
-	AC_MSG_WARN([Check not found; cannot run some unit tests])
-	have_check="no"
-])
+AC_ARG_ENABLE([tests],
+              AC_HELP_STRING([--disable-tests],
+                             [Disable the unit tests]),,
+              [enable_tests=yes])
+
+if test x$enable_tests = xyes ; then
+   dnl #
+   dnl # Check for Check
+   dnl #
+   AM_PATH_CHECK(, [have_check="yes"], [AC_MSG_ERROR([Check not found])] )
+else
+   have_check="no"
+fi
 
 AM_CONDITIONAL(HAVE_CHECK, test "$have_check" = "yes")