diff options
Diffstat (limited to 'lib/odbc')
| -rw-r--r-- | lib/odbc/configure.in | 12 | ||||
| -rw-r--r-- | lib/odbc/doc/src/notes.xml | 34 | ||||
| -rw-r--r-- | lib/odbc/vsn.mk | 2 |
3 files changed, 45 insertions, 3 deletions
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in index 83f7a47434..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,6 +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([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 @@ -203,6 +209,10 @@ AC_SUBST(TARGET_FLAGS) ;; esac +if test $odbc_required_headers = no; then + AC_MSG_WARN(["ODBC library - header check failed"]) + echo "ODBC library - header check failed" > $ERL_TOP/lib/odbc/SKIP +fi if test $odbc_lib_link_success = no; then AC_MSG_WARN(["ODBC library - link check failed"]) echo "ODBC library - link check failed" > $ERL_TOP/lib/odbc/SKIP diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml index 13dff1489f..b254ca3bc9 100644 --- a/lib/odbc/doc/src/notes.xml +++ b/lib/odbc/doc/src/notes.xml @@ -31,7 +31,39 @@ <p>This document describes the changes made to the odbc application. </p> - <section><title>ODBC 2.10.17</title> + <section><title>ODBC 2.10.19</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Updated configure test for header files sql.h and + sqlext.h to function correctly on windows.</p> + <p> + Own Id: OTP-11574</p> + </item> + </list> + </section> + +</section> + +<section><title>ODBC 2.10.18</title> + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Configure now also checks for the existence of the sql.h + header file</p> + <p> + Own Id: OTP-11483</p> + </item> + </list> + </section> + +</section> + +<section><title>ODBC 2.10.17</title> <section><title>Fixed Bugs and Malfunctions</title> <list> diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk index 34c3eff933..d9e2ab26a9 100644 --- a/lib/odbc/vsn.mk +++ b/lib/odbc/vsn.mk @@ -1 +1 @@ -ODBC_VSN = 2.10.17 +ODBC_VSN = 2.10.19 |