chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move images.h to images/ directory, and limit to just the images that
[disorder]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index ee452c95b3629f2040a8eb3a50bdbe9c94fe93d0..c72e59d26f279b1885399880ef8ffa6b6179a7a0 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
@@
-286,7
+286,7
@@
if test $want_cgi = yes; then
fi
done
])
fi
done
])
- if test "$rjk_cv_
cgiexec
dir" = "not found"; then
+ if test "$rjk_cv_
http
dir" = "not found"; then
AC_MSG_ERROR([cannot identify httpd documentroot. Set httpdir on configure command line])
fi
httpdir="$rjk_cv_httpdir"
AC_MSG_ERROR([cannot identify httpd documentroot. Set httpdir on configure command line])
fi
httpdir="$rjk_cv_httpdir"
@@
-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"
@@
-438,6
+443,8
@@
if test $want_alsa = yes; then
AC_CHECK_LIB([asound], [snd_pcm_open],
[AC_SUBST(LIBASOUND,[-lasound])])
fi
AC_CHECK_LIB([asound], [snd_pcm_open],
[AC_SUBST(LIBASOUND,[-lasound])])
fi
+AC_CHECK_LIB([samplerate],[src_new],
+ [AC_SUBST([LIBSAMPLERATE],[-lsamplerate])])
if test $want_server = yes; then
RJK_CHECK_LIB(db, db_create, [#include <db.h>],
[AC_SUBST(LIBDB,[-ldb])],
if test $want_server = yes; then
RJK_CHECK_LIB(db, db_create, [#include <db.h>],
[AC_SUBST(LIBDB,[-ldb])],
@@
-523,6
+530,7
@@
AC_CHECK_HEADERS([dlfcn.h gcrypt.h \
syslog.h unistd.h],[:],[
missing_headers="$missing_headers $ac_header"
])
syslog.h unistd.h],[:],[
missing_headers="$missing_headers $ac_header"
])
+AC_CHECK_HEADERS([samplerate.h])
if test ! -z "$missing_headers"; then
AC_MSG_ERROR([missing headers:$missing_headers])
if test ! -z "$missing_headers"; then
AC_MSG_ERROR([missing headers:$missing_headers])
@@
-677,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
@@
-820,6
+829,7
@@
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
@@
-838,6
+848,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