[Box Backup-dev] COMMIT r864 - box/chris/merge
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Thu Aug 31 22:48:24 BST 2006
Author: chris
Date: 2006-08-31 22:48:24 +0100 (Thu, 31 Aug 2006)
New Revision: 864
Modified:
box/chris/merge/configure.ac
Log:
* configure.ac
Revert to trunk (refs #3)
Modified: box/chris/merge/configure.ac
===================================================================
--- box/chris/merge/configure.ac 2006-08-31 20:11:19 UTC (rev 863)
+++ box/chris/merge/configure.ac 2006-08-31 21:48:24 UTC (rev 864)
@@ -44,7 +44,7 @@
VL_LIB_READLINE([have_libreadline=yes], [have_libreadline=no])
## Check for Berkely DB. Restrict to certain versions
-AX_PATH_BDB([1.x or 4.1], [
+AX_PATH_BDB(, [
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/uio.h sys/xattr.h])
+AC_CHECK_HEADERS([sys/xattr.h])
if test "$ac_cv_header_regex_h" = "yes"; then
AC_SEARCH_LIBS([regcomp], [pcreposix])
@@ -116,7 +116,6 @@
]])
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
@@ -125,14 +124,14 @@
if test "x$ac_cv_c_bigendian" != "xyes"; then
AX_BSWAP64
fi
-
if test "$target_os" != "mingw32"; then
AX_RANDOM_DEVICE
- AX_CHECK_MOUNT_POINT(,[
+fi
+AX_CHECK_MOUNT_POINT(,[
+ if test "$target_os" != "mingw32" -a "$target_os" != "winnt"; then
AC_MSG_ERROR([[cannot work out how to discover mount points on your platform]])
+ fi
])
-fi
-
AX_CHECK_MALLOC_WORKAROUND
@@ -239,7 +238,6 @@
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-dev
mailing list