TABLE_FIND() now uses typeof. We're committed to GCC anyway so it

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3c13dacc67f6d923a521eedad037fc2da16ab309..beb2803bf74c895b7171c7129b5fb6032fcbe497 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,3 @@
-
 # Process this file with autoconf to produce a configure script.
 #
 # This file is part of DisOrder.
@@ -33,6 +32,7 @@ AC_CANONICAL_HOST
 # What we want to build
 want_gtk=yes
 want_python=yes
+want_tests=yes
 
 # APIs we want
 want_alsa=yes
@@ -45,6 +45,7 @@ AC_SET_MAKE
 if test "x$GCC" = xyes; then
   gcc_werror=-Werror
 else
+  AC_MSG_ERROR([GNU C is required to build this program])
   gcc_werror=""
 fi
 
@@ -60,6 +61,10 @@ AC_ARG_WITH([coreaudio],
            [AS_HELP_STRING([--without-coreaudio],
                            [do not build with Core Audio support])],
            [want_coreaudio=$withval])
+AC_ARG_WITH([tests],
+           [AS_HELP_STRING([--without-tests],
+                           [do not build test suit])],
+           [want_tests=$withval])
 
 AC_MSG_CHECKING([for a known target platform])
 case "$host" in
@@ -166,7 +171,11 @@ AC_ARG_WITH([python],
                            [do not build Python support])],
            [want_python=$withval])
 
-subdirs="scripts lib clients doc examples debian"
+subdirs="scripts lib"
+if test $want_tests = yes; then
+  subdirs="${subdirs} libtests"
+fi
+subdirs="${subdirs} clients doc examples debian"
 
 if test $want_server = yes; then
   subdirs="${subdirs} server plugins driver templates sounds images"
@@ -177,7 +186,7 @@ if test $want_gtk = yes; then
     subdirs="${subdirs} images"
   fi
 fi
-if test $want_python = yes; then
+if test $want_tests = yes && test $want_python = yes; then
   AM_PATH_PYTHON([2.4])
   subdirs="${subdirs} python tests"
 fi
@@ -590,6 +599,7 @@ AC_CONFIG_FILES([Makefile
                 sounds/Makefile
                 python/Makefile
                 examples/Makefile
+                libtests/Makefile
                 tests/Makefile])
 AC_OUTPUT