chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Catch up with new CGI location
[disorder]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 175add47d004f248ede5434466450d2ff6f6a51b..2d193ad1d401fa4a77f30882a903d7ed7255a159 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.
# 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
# What we want to build
want_gtk=yes
want_python=yes
+want_tests=yes
# APIs we want
want_alsa=yes
# APIs we want
want_alsa=yes
@@
-45,6
+45,7
@@
AC_SET_MAKE
if test "x$GCC" = xyes; then
gcc_werror=-Werror
else
if test "x$GCC" = xyes; then
gcc_werror=-Werror
else
+ AC_MSG_ERROR([GNU C is required to build this program])
gcc_werror=""
fi
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])
[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
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])
[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
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"
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
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
AM_PATH_PYTHON([2.4])
subdirs="${subdirs} python tests"
fi
@@
-576,20
+585,22
@@
AH_BOTTOM([#ifdef __GNUC__
#endif])
AC_CONFIG_FILES([Makefile
#endif])
AC_CONFIG_FILES([Makefile
- templates/Makefile
images/Makefile
scripts/Makefile
lib/Makefile
server/Makefile
images/Makefile
scripts/Makefile
lib/Makefile
server/Makefile
+ cgi/Makefile
clients/Makefile
disobedience/Makefile
doc/Makefile
clients/Makefile
disobedience/Makefile
doc/Makefile
+ templates/Makefile
plugins/Makefile
driver/Makefile
debian/Makefile
sounds/Makefile
python/Makefile
examples/Makefile
plugins/Makefile
driver/Makefile
debian/Makefile
sounds/Makefile
python/Makefile
examples/Makefile
+ libtests/Makefile
tests/Makefile])
AC_OUTPUT
tests/Makefile])
AC_OUTPUT