X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/9646482db2f5429ce1bcbeaebeb85c9c1b9af87c..812b526d127c6657e571db8b33a58137af6709cd:/configure.ac diff --git a/configure.ac b/configure.ac index 7b4fe51..1e465ab 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]) @@ -596,10 +596,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])