X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/b9bbb6c8bd8630fe4321045ce57174c4890bfa46..8b15f02d9c4041d45a310dce13f67b5a8bf11ca8:/configure.ac

diff --git a/configure.ac b/configure.ac
index bfed8b5..18380c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,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
@@ -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,10 +171,14 @@ 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"
+  subdirs="${subdirs} server cgi plugins driver templates sounds images"
 fi
 if test $want_gtk = yes; then
   subdirs="${subdirs} disobedience"
@@ -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
@@ -203,12 +212,17 @@ if test "$GNUSED" = "not found"; then
 fi
 AC_SUBST([GNUSED])
 
+AC_CHECK_PROGS([GROG],[grog])
+AM_CONDITIONAL([GROG],[test "x$GROG" != xnone])
+
 missing_libraries=""
 missing_headers=""
 missing_functions=""
 
 AC_DEFINE(_GNU_SOURCE, 1, [required for e.g. strsignal])
 
+AC_PATH_PROG([SENDMAIL],[sendmail],[none],[$PATH:/usr/sbin:/usr/lib])
+
 # Macs might have libraries under fink's root
 AC_PATH_PROG([FINK],[fink],[none],[$PATH:/sw/bin])
 if test "x$FINK" != xnone; then
@@ -580,6 +594,7 @@ AC_CONFIG_FILES([Makefile
 		 scripts/Makefile
 		 lib/Makefile
 		 server/Makefile
+		 cgi/Makefile
 		 clients/Makefile
 		 disobedience/Makefile
 		 doc/Makefile
@@ -590,6 +605,7 @@ AC_CONFIG_FILES([Makefile
 		 sounds/Makefile
 		 python/Makefile
 		 examples/Makefile
+		 libtests/Makefile
 		 tests/Makefile])
 AC_OUTPUT