aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-11-21 10:57:35 +0100
committerLukas Larsson <[email protected]>2013-11-21 10:57:35 +0100
commitfaf1528134253fd6e7eb95c3a6e77d40eb3377eb (patch)
tree3f36a26f7619416925df60a0eb64a513cf738696
parentd87e165b2322d72ba53a821b6eb3bc237a600703 (diff)
parent90c8450bb691a7b57ce326fddd1f44ef01db390f (diff)
downloadotp-faf1528134253fd6e7eb95c3a6e77d40eb3377eb.tar.gz
otp-faf1528134253fd6e7eb95c3a6e77d40eb3377eb.tar.bz2
otp-faf1528134253fd6e7eb95c3a6e77d40eb3377eb.zip
Merge branch 'maint'
* maint: odbc: Add configure check for sql.h
-rw-r--r--lib/odbc/configure.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index 83f7a47434..531ad84fb9 100644
--- a/lib/odbc/configure.in
+++ b/lib/odbc/configure.in
@@ -105,6 +105,7 @@ 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])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -203,6 +204,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