diff options
author | Richard H Lee <richard@webdezign.co.uk> | 2019-12-09 16:31:24 +0000 |
---|---|---|
committer | Nico Williams <nico@cryptonector.com> | 2019-12-29 19:24:04 -0600 |
commit | 2065d6c3aa700742d4fabf11e1d9462119d8f104 (patch) | |
tree | bd7caeb52d1826b2b53cc0c6b70e620d72a34c7d | |
parent | e74eab828e658de3eca089f82b84fb67ed4c3a75 (diff) |
Differentiate WIN32 / Cygwin in configure script
shlwapi.h is present on both systems
-rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7d2355b2..68097b91 100644 --- a/configure.ac +++ b/configure.ac @@ -52,8 +52,9 @@ fi AC_CHECK_FUNCS(memmem) AC_CHECK_FUNCS(mkstemp) -AC_CHECK_HEADER("shlwapi.h",[have_win32=1;]) -AM_CONDITIONAL([WIN32], [test "x$have_win32" = x1]) +AC_CHECK_HEADER("sys/cygwin.h", [have_cygwin=1;]) +AC_CHECK_HEADER("shlwapi.h",[have_shlwapi=1;]) +AM_CONDITIONAL([WIN32], [test \( "x$have_shlwapi" = x1 \) -a ! \( "x$have_cygwin" = x1 \)]) dnl Running tests with Valgrind is slow. It is faster to iterate on dnl code without Valgrind until tests pass, then enable Valgrind and |