X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/419893d77041c006cb22eeaa189f9797773fbdc1..efd23a800d05515c519fdd7f00e7d0015ba73f5a:/configure.ac
diff --git a/configure.ac b/configure.ac
index 0f8f91c..62b0584 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,9 @@
# along with this program. If not, see .
#
-AC_INIT([disorder], [4.2+], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [4.3+], [richard+disorder@sfere.greenend.org.uk])
AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [4.2+])
+AM_INIT_AUTOMAKE(disorder, [4.3+])
AC_CONFIG_SRCDIR([server/disorderd.c])
AM_CONFIG_HEADER([config.h])
@@ -41,6 +41,7 @@ want_coreaudio=yes
# Checks for programs.
AC_PROG_CC
+AM_PROG_CC_C_O
AC_PROG_AWK
AC_SET_MAKE
if test "x$GCC" = xyes; then
@@ -91,7 +92,7 @@ case "$host" in
*-apple-darwin* )
AC_MSG_RESULT([Mac OS X])
if test $want_coreaudio = yes; then
- COREAUDIO="-framework CoreAudio"
+ COREAUDIO="-framework CoreFoundation -framework CoreServices -framework CoreAudio"
fi
browser=open
AC_MSG_CHECKING([Mac OS X target version])
@@ -188,7 +189,7 @@ AC_CACHE_CHECK([sox version],[rjk_cv_soxver],[
AC_CACHE_CHECK([default sox generation],[rjk_cv_soxgen],[
case $rjk_cv_soxver in
- [0-9].* | 1[0123].* )
+ [[0-9]].* | 1[[0123]].* )
rjk_cv_soxgen=0
;;
* )
@@ -596,10 +597,27 @@ if test $want_server = yes; then
],
[rjk_cv_db_version=ok],
[rjk_cv_db_version=inadequate])
+ if test $rjk_cv_db_version = ok; then
+ AC_PREPROC_IFELSE([
+ #include
+ #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 6
+ # error http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510270
+ #endif
+ ],
+ [rjk_cv_db_version=ok],
+ [rjk_cv_db_version=toxic])
+ fi
])
- if test $rjk_cv_db_version != ok; then
- AC_MSG_ERROR([need db.h version at least 4.2])
- fi
+ case $rjk_cv_db_version in
+ ok )
+ ;;
+ inadequate )
+ AC_MSG_ERROR([need db version at least 4.3 (but not 4.6)])
+ ;;
+ toxic )
+ AC_MSG_ERROR([db version 4.6.x does not work - see debian bug 510270])
+ ;;
+ esac
fi
AM_CONDITIONAL([SERVER], [test x$want_server = xyes])