summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2014-09-16 12:25:29 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2014-09-16 12:31:56 +0200
commita00b92fa20da1820987f654a2ea9a1f830355738 (patch)
treeb9d71946c52960ecac9082c4a7240de4d42c1cdd
parent92dd751af9be372dc887dac91ebdfac44c13a171 (diff)
Use system ODBC on MS Windows unless specifically overriden
Change-Id: I11abb53486e45d9c7058c42011df41b5fad0fcde
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 07ff996096a1..c2f00fea231b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1822,7 +1822,7 @@ AC_ARG_WITH(libbase-jar,
AC_ARG_WITH(system-odbc,
AS_HELP_STRING([--with-system-odbc],
[Use the odbc headers already on system.]),,
- [with_system_odbc="$with_system_headers"])
+ [with_system_odbc="auto"])
AC_ARG_WITH(system-sane,
AS_HELP_STRING([--with-system-sane],
@@ -8607,7 +8607,7 @@ dnl ===================================================================
dnl Check for system odbc
dnl ===================================================================
AC_MSG_CHECKING([which odbc headers to use])
-if test "$with_system_odbc" = "yes" ; then
+if test "$with_system_odbc" = "yes" -o '(' "$with_system_headers" = "yes" -a "$with_system_odbc" = "auto" ')' -o '(' "$_os" = "WINNT" -a "$with_system_odbc" != "no" ')'; then
AC_MSG_RESULT([external])
SYSTEM_ODBC_HEADERS=TRUE