From 953375ead071341a403bb6990ab337f7634584ff Mon Sep 17 00:00:00 2001
From: Evan Miller <emmiller@gmail.com>
Date: Tue, 11 Aug 2020 12:23:59 -0400
Subject: [PATCH] Define separate Travis targets for iODBC and unixODBC

---
 .travis.yml | 77 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3e08977..2e91e9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,30 +4,78 @@ jobs:
   include:
   - compiler: clang
     os: linux
+    addons:
+      apt:
+        packages:
+        - libiodbc2-dev
+    env:
+      - CONFIGURE_FLAGS=--with-iodbc=/usr
+  - compiler: clang
+    os: linux
+    addons:
+      apt:
+        packages:
+        - unixodbc-dev
+    env:
+      - CONFIGURE_FLAGS=--with-unixodbc=/usr
   - compiler: gcc
     os: linux
+    addons:
+      apt:
+        packages:
+        - libiodbc2-dev
+    env:
+      - CONFIGURE_FLAGS=--with-iodbc=/usr
+  - compiler: gcc
+    os: linux
+    addons:
+      apt:
+        packages:
+        - unixodbc-dev
+    env:
+      - CONFIGURE_FLAGS=--with-unixodbc=/usr
   - compiler: clang
     os: osx
     osx_image: xcode11.4
+    addons:
+      homebrew:
+        packages:
+        - libiodbc
+    env:
+      - CONFIGURE_FLAGS=--with-iodbc=/usr/local/opt
+  - compiler: clang
+    os: osx
+    osx_image: xcode11.4
+    addons:
+      homebrew:
+        packages:
+        - unixodbc
+    env:
+      - CONFIGURE_FLAGS=--with-unixodbc=/usr/local/opt
   - compiler: gcc
     os: osx
     osx_image: xcode11.4
-
-addons:
-  apt:
-    packages:
-    - libiodbc2-dev
-    - unixodbc-dev
-  homebrew:
-    packages:
-    - libiodbc
-    - unixodbc
+    addons:
+      homebrew:
+        packages:
+        - libiodbc
+    env:
+      - CONFIGURE_FLAGS=--with-iodbc=/usr/local/opt
+  - compiler: gcc
+    os: osx
+    osx_image: xcode11.4
+    addons:
+      homebrew:
+        packages:
+        - unixodbc
+    env:
+      - CONFIGURE_FLAGS=--with-unixodbc=/usr/local/opt
 
 before_script:
   - autoreconf -i -f -Wno-portability
 
 script:
-  - ./configure --disable-man --disable-silent-rules --disable-glib
+  - ./configure --disable-man --disable-silent-rules --disable-glib $CONFIGURE_FLAGS
   - make
   - ./src/util/mdb-array test/data/ASampleDatabase.accdb "Asset Items"
   - ./src/util/mdb-array test/data/nwind.mdb "Customers"
@@ -41,11 +89,4 @@ 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