diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-09-16 12:25:29 +0200 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-09-26 15:37:28 +0200 |
commit | 314c469c93f0ac139f64f742d3fd89e587f42970 (patch) | |
tree | 2620f93ee1a5b628d024e4037be5ae2ceaccae01 /configure.ac | |
parent | implement --with-system-odbc on windows (diff) | |
download | core-314c469c93f0ac139f64f742d3fd89e587f42970.tar.gz core-314c469c93f0ac139f64f742d3fd89e587f42970.zip |
try "Use system ODBC on MS Windows unless specifically overriden" again
Now that Noel has a working pattch for system ODBC on MS Windows
Change-Id: I11abb53486e45d9c7058c42011df41b5fad0fcde
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a0b6ed5ff9a0..823fcddf43d4 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], @@ -8598,7 +8598,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 |