X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/27280a54818eaa27a132fa0ab92a096c8cd4a7d3..fdb4e27ac67437dd655dc4b70613b977eeabccb1:/configure.ac
diff --git a/configure.ac b/configure.ac
index 3c1125c..69cdea3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,9 @@
# along with this program. If not, see .
#
-AC_INIT([disorder], [4.3+], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [5.0], [richard+disorder@sfere.greenend.org.uk])
AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [4.3+])
+AM_INIT_AUTOMAKE(disorder, [5.0])
AC_CONFIG_SRCDIR([server/disorderd.c])
AM_CONFIG_HEADER([config.h])
@@ -339,9 +339,6 @@ subdirs="${subdirs} clients doc examples debian"
if test $want_server = yes; then
subdirs="${subdirs} server plugins sounds"
- if test "$rjk_cv_libao_plugin_api_works" = yes; then
- subdirs="${subdirs} driver"
- fi
fi
if test $want_cgi = yes; then
subdirs="${subdirs} cgi templates images"
@@ -468,19 +465,6 @@ if test $want_server = yes; then
AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new],
[AC_SUBST(LIBFLAC,[-lFLAC])],
[missing_libraries="$missing_libraries libFLAC"])
- if test $ac_cv_lib_ao_ao_initialize = yes; then
- # libao 1.0.0 breaks the plugin interface
- AC_CACHE_CHECK([whether libao has a working plugin interface],
- [rjk_cv_libao_plugin_api_works],[
- AC_COMPILE_IFELSE([#include
-#include
-
-int ao_plugin_device_init(ao_device *d) {
- d->internal = 0;
-}],[rjk_cv_libao_plugin_api_works=yes],[rjk_cv_libao_plugin_api_works=no])])
- else
- rjk_cv_libao_plugin_api_works=no
- fi
fi
AC_CHECK_LIB([pthread], [pthread_create],
[AC_SUBST(LIBPTHREAD,[-lpthread])],
@@ -538,7 +522,6 @@ if test $want_server = yes; then
AC_CHECK_HEADERS([db.h],[:],[
missing_headers="$missing_headers $ac_header"
])
- AC_CHECK_HEADERS([FLAC/file_decoder.h])
fi
AC_CHECK_HEADERS([dlfcn.h gcrypt.h \
getopt.h iconv.h langinfo.h \
@@ -563,6 +546,18 @@ AC_C_BIGENDIAN
AC_CHECK_TYPES([struct sockaddr_in6],,,[AC_INCLUDES_DEFAULT
#include ])
+# Figure out how we'll check for devices being mounted and unmounted
+AC_CACHE_CHECK([for list of mounted filesystems],[rjk_cv_mtab],[
+ if test -e /etc/mtab; then
+ rjk_cv_mtab=/etc/mtab
+ else
+ rjk_cv_mtab=none
+ fi
+])
+if test $rjk_cv_mtab != none; then
+ AC_DEFINE_UNQUOTED([PATH_MTAB],["$rjk_cv_mtab"],[path to file containing mount list])
+fi
+
# enable -Werror when we check for certain characteristics:
old_CFLAGS="${CFLAGS}"
@@ -655,7 +650,7 @@ if test ! -z "$missing_functions"; then
fi
# Functions we can take or leave
-AC_CHECK_FUNCS([fls])
+AC_CHECK_FUNCS([fls getfsstat])
if test $want_server = yes; then
# had better be version 3 or later
@@ -849,7 +844,6 @@ AC_CONFIG_FILES([Makefile
doc/Makefile
templates/Makefile
plugins/Makefile
- driver/Makefile
debian/Makefile
sounds/Makefile
python/Makefile