From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 19 Nov 2011 23:29:02 +0000 (-0500)
Subject: Correct the detection of wincrypt.h and winioctl.h
X-Git-Tag: v3.0.1b~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7ae3cca1ff7fa70ab50d60f2825736b658b33d3;p=thirdparty%2Flibarchive.git

Correct the detection of wincrypt.h and winioctl.h
From: Denis B. MARTIN

SVN-Revision: 3809
---

diff --git a/configure.ac b/configure.ac
index 7111c0fd4..95f80f439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,8 +217,13 @@ AC_CHECK_HEADERS([sys/mkdev.h sys/mount.h])
 AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/select.h sys/statfs.h sys/statvfs.h])
 AC_CHECK_HEADERS([sys/time.h sys/utime.h sys/utsname.h sys/vfs.h])
 AC_CHECK_HEADERS([time.h unistd.h utime.h wchar.h wctype.h])
-# check windows.h first.
-AC_CHECK_HEADERS([windows.h wincrypt.h winioctl.h])
+AC_CHECK_HEADERS([windows.h])
+# check windows.h first; the other headers require it.
+AC_CHECK_HEADERS([wincrypt.h winioctl.h],[],[],
+[[#ifdef HAVE_WINDOWS_H
+# include <windows.h>
+#endif
+]])
 
 # Checks for libraries.
 AC_ARG_WITH([zlib],