summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-09-16 14:57:27 +0200
committerJan Holesovsky <kendy@collabora.com>2014-09-16 14:57:27 +0200
commitbd968717c9ca5a6fe8347f93014ac0553ec6d19a (patch)
tree4bf9d124555252390429366f2c8b7b9f069289d9
parentbe36698f60d459cc88b703a007e3bf4209842492 (diff)
Revert "Use system ODBC on MS Windows unless specifically overriden"
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index c2f00fea231b..07ff996096a1 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="auto"])
+ [with_system_odbc="$with_system_headers"])
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" -o '(' "$with_system_headers" = "yes" -a "$with_system_odbc" = "auto" ')' -o '(' "$_os" = "WINNT" -a "$with_system_odbc" != "no" ')'; then
+if test "$with_system_odbc" = "yes" ; then
AC_MSG_RESULT([external])
SYSTEM_ODBC_HEADERS=TRUE