Allow make check and tests module to be disabled, as it's not portable yet.

svn path=/trunk/yasm/; revision=200

diff --git a/check/Makefile.am b/check/Makefile.am
index a8896465290d66e6075abf8284a7ae7d774bf59c..4f258aebc7fe642a91ea41e45eca4e7b222c0df2 100644 (file)
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -1,6 +1,12 @@
 # $IdPath$
 
+if CHECK
 noinst_LIBRARIES=libcheck.a
+TESTS =
+else
+noinst_LIBRARIES=
+TESTS = nocheck_error
+endif
 
 libcheck_a_SOURCES = \
        check.c         \
@@ -18,6 +24,10 @@ libcheck_a_SOURCES = \
        list.c          \
        list.h
 
+nocheck_error:
+       @echo "Run configure with --enable-check before running make check"
+       @exit 1
+
 if DEV
 CFLAGS = -ansi -pedantic -Wall -g
 endif

diff --git a/configure.ac b/configure.ac
index 7fd2a8652005aaa0128b45664980f5ce11bcd7ca..a0f61022de3f395fc6ddbf4cb6f332d808828dcb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,15 @@ AC_ARG_ENABLE(dev,
 esac],[dev=false])
 AM_CONDITIONAL(DEV, test x$dev = xtrue)
 
+AC_ARG_ENABLE(check,
+[  --disable-check Disable building of test suite and make check],
+[case "${enableval}" in
+  yes) check=true ;;
+  no)  check=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-check) ;;
+esac],[check=true])
+AM_CONDITIONAL(CHECK, test x$check = xtrue)
+
 AM_PROG_CC_STDC
 
 ALL_LINGUAS=""

diff --git a/configure.in b/configure.in
index 7fd2a8652005aaa0128b45664980f5ce11bcd7ca..a0f61022de3f395fc6ddbf4cb6f332d808828dcb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,6 +17,15 @@ AC_ARG_ENABLE(dev,
 esac],[dev=false])
 AM_CONDITIONAL(DEV, test x$dev = xtrue)
 
+AC_ARG_ENABLE(check,
+[  --disable-check Disable building of test suite and make check],
+[case "${enableval}" in
+  yes) check=true ;;
+  no)  check=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-check) ;;
+esac],[check=true])
+AM_CONDITIONAL(CHECK, test x$check = xtrue)
+
 AM_PROG_CC_STDC
 
 ALL_LINGUAS=""

diff --git a/libyasm/tests/Makefile.am b/libyasm/tests/Makefile.am
index bb97bc201e99aa4499f60c210f200691260b4342..7dc55967c8aa8e428fe19e2b5d94babd235b2a27 100644 (file)
--- a/libyasm/tests/Makefile.am
+++ b/libyasm/tests/Makefile.am
@@ -1,10 +1,15 @@
 # $IdPath$
 
+if CHECK
 TESTS = \
        bytecode_test
 
 noinst_PROGRAMS = \
        bytecode_test
+else
+TESTS =
+noinst_PROGRAMS =
+endif
 
 bytecode_test_SOURCES = \
        bytecode_test.c

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index bb97bc201e99aa4499f60c210f200691260b4342..7dc55967c8aa8e428fe19e2b5d94babd235b2a27 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,10 +1,15 @@
 # $IdPath$
 
+if CHECK
 TESTS = \
        bytecode_test
 
 noinst_PROGRAMS = \
        bytecode_test
+else
+TESTS =
+noinst_PROGRAMS =
+endif
 
 bytecode_test_SOURCES = \
        bytecode_test.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ab95ecbf0f74f4a682ac19506bb292f5b3490434..5a72427b2b4ff1c8c200f2e39fc95c9200b3186c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,13 @@
 # $IdPath$
 
+if CHECK
 #TESTS = \
 
 #noinst_PROGRAMS = \
+else
+#TESTS =
+#noinst_PROGRAMS =
+endif
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/check
 LDADD = \