summaryrefslogtreecommitdiff
path: root/libraries/base/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/base/configure.ac')
-rw-r--r--libraries/base/configure.ac11
1 files changed, 8 insertions, 3 deletions
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index af041a7ad5..a141a25a90 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -69,7 +69,12 @@ if test "$ac_cv_header_poll_h" = yes && test "$ac_cv_func_poll" = yes; then
AC_DEFINE([HAVE_POLL], [1], [Define if you have poll support.])
fi
-#flock
+# Linux open file descriptor locks
+AC_CHECK_DECL([F_OFD_SETLK], [
+ AC_DEFINE([HAVE_OFD_LOCKING], [1], [Define if you have open file descriptor lock support.])
+])
+
+# flock
AC_CHECK_FUNCS([flock])
if test "$ac_cv_header_sys_file_h" = yes && test "$ac_cv_func_flock" = yes; then
AC_DEFINE([HAVE_FLOCK], [1], [Define if you have flock support.])
@@ -229,10 +234,10 @@ AS_IF([test "x$with_libcharset" != xno],
fi
# Hack - md5.h needs HsFFI.h. Is there a better way to do this?
-CFLAGS="-I../../includes $CFLAGS"
+CFLAGS="-I../.. -I../../../../includes $CFLAGS"
dnl Calling AC_CHECK_TYPE(T) makes AC_CHECK_SIZEOF(T) abort on failure
dnl instead of considering sizeof(T) as 0.
-AC_CHECK_TYPE([struct MD5Context], [], [], [#include "include/md5.h"])
+AC_CHECK_TYPE([struct MD5Context], [], [AC_MSG_ERROR([internal error])], [#include "include/md5.h"])
AC_CHECK_SIZEOF([struct MD5Context], [], [#include "include/md5.h"])
AC_SUBST(EXTRA_LIBS)