From f7e863b8e4f965f97e60c1529349afc4265a4e89 Mon Sep 17 00:00:00 2001
From: Evan Miller <emmiller@gmail.com>
Date: Tue, 11 Aug 2020 11:56:08 -0400
Subject: [PATCH] Put unixODBC under basic build / test coverage

---
 .travis.yml  | 11 ++++++++++-
 configure.ac |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4521f72..3e08977 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,17 @@ addons:
   apt:
     packages:
     - libiodbc2-dev
+    - unixodbc-dev
   homebrew:
     packages:
     - libiodbc
+    - unixodbc
 
 before_script:
   - autoreconf -i -f -Wno-portability
 
 script:
-  - ./configure --disable-man --disable-silent-rules --disable-glib --with-iodbc=/usr
+  - ./configure --disable-man --disable-silent-rules --disable-glib
   - make
   - ./src/util/mdb-array test/data/ASampleDatabase.accdb "Asset Items"
   - ./src/util/mdb-array test/data/nwind.mdb "Customers"
@@ -39,4 +41,11 @@ script:
   - ./src/util/mdb-tables test/data/nwind.mdb
   - ./src/util/mdb-ver test/data/ASampleDatabase.accdb
   - ./src/util/mdb-ver test/data/nwind.mdb
+  - make clean
+  - ./configure --disable-man --disable-silent-rules --disable-glib --with-iodbc=/usr
+  - make
+  - env MDBPATH=test/data ./src/odbc/unittest
+  - make clean
+  - ./configure --disable-man --disable-silent-rules --disable-glib --with-unixodbc=/usr
+  - make
   - env MDBPATH=test/data ./src/odbc/unittest
diff --git a/configure.ac b/configure.ac
index a82e721..1563cb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,11 @@ if test "$with_unixodbc"; then
 	ODBC_LIBS="-L$with_unixodbc/lib"
 	CFLAGS="$CFLAGS -DUNIXODBC"
 
+	dnl SIZEOF_LONG_INT and HAVE_LONG_LONG are required by some versions of unixODBC
+	dnl https://github.com/lurcher/unixODBC/issues/40
+	AC_CHECK_SIZEOF([long int])
+	AC_CHECK_TYPES([long long])
+
 	OLDLDFLAGS=$LDFLAGS
 	LDFLAGS="$LDFLAGS $ODBC_LIBS"
 	AC_CHECK_LIB(odbcinst, SQLGetPrivateProfileString,