summaryrefslogtreecommitdiff
path: root/infrastructure/m4
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2011-10-08 12:06:34 +0000
committerChris Wilson <chris+github@qwirx.com>2011-10-08 12:06:34 +0000
commit79ea9acc7ab54b22ec4f453b75b372fc96152562 (patch)
treef36e184d4525480a4ab32ed808d67a43cc8a7efd /infrastructure/m4
parent2777ca99f953b738adac92e95158b73c1ef14ee1 (diff)
Silence warnings from new MinGW headers that expect __MINGW_FEATURES__
to be defined. Check for fcntl.h and include it if we have it, not just on MSVC, now that MinGW also defines O_BINARY in newer versions.
Diffstat (limited to 'infrastructure/m4')
-rw-r--r--infrastructure/m4/boxbackup_tests.m42
-rw-r--r--infrastructure/m4/vl_lib_readline.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4
index b9331dec..245c54b8 100644
--- a/infrastructure/m4/boxbackup_tests.m4
+++ b/infrastructure/m4/boxbackup_tests.m4
@@ -126,7 +126,7 @@ esac
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([dlfcn.h getopt.h process.h pwd.h signal.h])
+AC_CHECK_HEADERS([dlfcn.h fcntl.h getopt.h process.h pwd.h signal.h])
AC_CHECK_HEADERS([syslog.h time.h cxxabi.h])
AC_CHECK_HEADERS([netinet/in.h])
AC_CHECK_HEADERS([sys/file.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h])
diff --git a/infrastructure/m4/vl_lib_readline.m4 b/infrastructure/m4/vl_lib_readline.m4
index 29a27ac6..e9cb72b8 100644
--- a/infrastructure/m4/vl_lib_readline.m4
+++ b/infrastructure/m4/vl_lib_readline.m4
@@ -91,9 +91,9 @@ AC_DEFUN([BOX_CHECK_VAR], [
dnl VL_LIB_READLINE_CHECK(name, libraries, headers, history headers)
AC_DEFUN([VL_LIB_READLINE_CHECK], [
+ ORIG_LIBS="$LIBS"
AC_CACHE_CHECK([for $1 library],
[vl_cv_lib_$1], [
- ORIG_LIBS="$LIBS"
vl_cv_lib_$1=""
for readline_lib in $2; do
for termcap_lib in "" termcap curses ncurses pdcurses; do