[Box Backup-commit] COMMIT r975 - box/trunk
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Thu Oct 12 20:40:20 BST 2006
Author: chris
Date: 2006-10-12 20:40:20 +0100 (Thu, 12 Oct 2006)
New Revision: 975
Modified:
box/trunk/configure.ac
Log:
* Show the required versions of Berkeley DB when configure fails to find them
* Check for sys/uio.h
* Check for O_BINARY
* Clean up code for AX_CHECK_MOUNT_POINT
* Display whether regular expressions are enabled at the end
Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac 2006-10-11 22:00:52 UTC (rev 974)
+++ box/trunk/configure.ac 2006-10-12 19:40:20 UTC (rev 975)
@@ -44,7 +44,7 @@
VL_LIB_READLINE([have_libreadline=yes], [have_libreadline=no])
## Check for Berkely DB. Restrict to certain versions
-AX_PATH_BDB(, [
+AX_PATH_BDB([1.x or 4.1], [
LIBS="$BDB_LIBS $LIBS"
LDFLAGS="$BDB_LDFLAGS $LDFLAGS"
CPPFLAGS="$CPPFLAGS $BDB_CPPFLAGS"
@@ -89,7 +89,7 @@
AC_CHECK_HEADERS([syslog.h time.h])
AC_CHECK_HEADERS([netinet/in.h])
AC_CHECK_HEADERS([sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h])
-AC_CHECK_HEADERS([sys/xattr.h])
+AC_CHECK_HEADERS([sys/uio.h sys/xattr.h])
if test "$ac_cv_header_regex_h" = "yes"; then
AC_SEARCH_LIBS([regcomp], [pcreposix])
@@ -116,6 +116,7 @@
]])
AC_CHECK_DECLS([INFTIM],,, [[#include <poll.h>]])
AC_CHECK_DECLS([SO_PEERCRED],,, [[#include <sys/socket.h>]])
+AC_CHECK_DECLS([O_BINARY],,,)
AC_HEADER_TIME
AC_STRUCT_TM
AX_CHECK_DIRENT_D_TYPE
@@ -124,14 +125,14 @@
if test "x$ac_cv_c_bigendian" != "xyes"; then
AX_BSWAP64
fi
+
if test "$target_os" != "mingw32"; then
AX_RANDOM_DEVICE
-fi
-AX_CHECK_MOUNT_POINT(,[
- if test "$target_os" != "mingw32" -a "$target_os" != "winnt"; then
+ AX_CHECK_MOUNT_POINT(,[
AC_MSG_ERROR([[cannot work out how to discover mount points on your platform]])
- fi
])
+fi
+
AX_CHECK_MALLOC_WORKAROUND
@@ -238,6 +239,7 @@
without these features, but will work better where they are present. Refer
to the documentation for more information on each feature.
+Regular expressions: $ac_cv_header_regex_h
Large files: $have_large_file_support
Berkeley DB: $ax_path_bdb_ok
Readline: $have_libreadline
More information about the Boxbackup-commit
mailing list