aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-01-21 15:36:29 +0100
committerIngela Anderton Andin <[email protected]>2014-01-21 15:36:29 +0100
commit704f2b867949aa5697b3abff672631f96cdfa9b2 (patch)
treee5dc99b3d51f89bde88c359c745b3fb4240e1684
parentd4046b68c706ce5c4485185738256e5d7bc88138 (diff)
parent41db1e8520171908b3ebc4ecd1d09d83dd4dc535 (diff)
downloadotp-704f2b867949aa5697b3abff672631f96cdfa9b2.tar.gz
otp-704f2b867949aa5697b3abff672631f96cdfa9b2.tar.bz2
otp-704f2b867949aa5697b3abff672631f96cdfa9b2.zip
Merge remote-tracking branch 'upstream/maint'
-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