chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc-base registration for Disobedience manual
[disorder]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index f527fffb6c9e75de5d95e27c2627dbbeed3b727b..6466efd5919fb7a46fa84bc1b26628af1b8c76df 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,7
+1,7
@@
# 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.
-# Copyright (C) 2004-20
09
Richard Kettlewell
+# Copyright (C) 2004-20
10
Richard Kettlewell
# Portions copyright (C) 2007 Ross Younger
#
# This program is free software: you can redistribute it and/or modify
# Portions copyright (C) 2007 Ross Younger
#
# This program is free software: you can redistribute it and/or modify
@@
-326,6
+326,11
@@
if test -z "$pkghttpdir"; then
fi
AC_SUBST([pkghttpdir])
fi
AC_SUBST([pkghttpdir])
+if test -z "$dochtmldir"; then
+ dochtmldir='$(docdir)/html'
+fi
+AC_SUBST([dochtmldir])
+
subdirs="scripts lib"
if test $want_tests = yes; then
subdirs="${subdirs} libtests"
subdirs="scripts lib"
if test $want_tests = yes; then
subdirs="${subdirs} libtests"
@@
-333,7
+338,7
@@
fi
subdirs="${subdirs} clients doc examples debian"
if test $want_server = yes; then
subdirs="${subdirs} clients doc examples debian"
if test $want_server = yes; then
- subdirs="${subdirs} server plugins
driver
sounds"
+ subdirs="${subdirs} server plugins sounds"
fi
if test $want_cgi = yes; then
subdirs="${subdirs} cgi templates images"
fi
if test $want_cgi = yes; then
subdirs="${subdirs} cgi templates images"
@@
-680,6
+685,7
@@
AM_CONDITIONAL([SERVER], [test x$want_server = xyes])
if test $want_gtk = yes; then
AC_DEFINE([WITH_GTK], [1], [define if using GTK+])
fi
if test $want_gtk = yes; then
AC_DEFINE([WITH_GTK], [1], [define if using GTK+])
fi
+AM_CONDITIONAL([GTK], [test x$want_gtk = xyes])
if test "x$GCC" = xyes; then
# We need LLONG_MAX and annoyingly GCC doesn't always give it to us
if test "x$GCC" = xyes; then
# We need LLONG_MAX and annoyingly GCC doesn't always give it to us
@@
-823,10
+829,10
@@
AC_CONFIG_FILES([Makefile
cgi/Makefile
clients/Makefile
disobedience/Makefile
cgi/Makefile
clients/Makefile
disobedience/Makefile
+ disobedience/manual/Makefile
doc/Makefile
templates/Makefile
plugins/Makefile
doc/Makefile
templates/Makefile
plugins/Makefile
- driver/Makefile
debian/Makefile
sounds/Makefile
python/Makefile
debian/Makefile
sounds/Makefile
python/Makefile
@@
-841,6
+847,9
@@
fi
if test $want_python = no; then
AC_MSG_WARN([cannot run the test suit without Python])
fi
if test $want_python = no; then
AC_MSG_WARN([cannot run the test suit without Python])
fi
+if test $want_server = yes && test "$ac_cv_lib_samplerate_src_new" != yes; then
+ AC_MSG_WARN([libsamplerate will be required in a future version])
+fi
# Local Variables:
# indent-tabs-mode:nil
# Local Variables:
# indent-tabs-mode:nil