aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-01-21 15:34:19 +0100
committerIngela Anderton Andin <[email protected]>2014-01-21 15:34:19 +0100
commit41db1e8520171908b3ebc4ecd1d09d83dd4dc535 (patch)
treedafe9251306014e5e12dc063e3fa095eb5f99052
parent8de45496ceacdad8bc01a137d180602b089a8d65 (diff)
parentecdca9d27450e1b9f96454dfa5997ed6b1e05fc8 (diff)
downloadotp-41db1e8520171908b3ebc4ecd1d09d83dd4dc535.tar.gz
otp-41db1e8520171908b3ebc4ecd1d09d83dd4dc535.tar.bz2
otp-41db1e8520171908b3ebc4ecd1d09d83dd4dc535.zip
Merge branch 'ia/odbc/configure/OTP-11574' into maint
* ia/odbc/configure/OTP-11574: odbc: Fix configure check to work proparly on windows
-rw-r--r--lib/odbc/configure.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index 531ad84fb9..fa81f36e98 100644
--- a/lib/odbc/configure.in
+++ b/lib/odbc/configure.in
@@ -1,7 +1,7 @@
dnl
dnl %CopyrightBegin%
dnl
-dnl Copyright Ericsson AB 2005-2013. All Rights Reserved.
+dnl Copyright Ericsson AB 2005-2014. All Rights Reserved.
dnl
dnl The contents of this file are subject to the Erlang Public License,
dnl Version 1.1, (the "License"); you may not use this file except in
@@ -105,7 +105,12 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h netdb.h stdlib.h string.h sys/socket.h winsock2.h])
-AC_CHECK_HEADERS([sql.h, sqlext.h], [odbc_required_headers=yes], [odbc_required_headers=no])
+AC_CHECK_HEADERS([windows.h])
+AC_CHECK_HEADERS([sql.h sqlext.h], [odbc_required_headers=yes], [odbc_required_headers=no],
+[[#ifdef HAVE_WINDOWS_H
+ # include <windows.h>
+ #endif
+ ]])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST