From 5b9a20133a4dec9d877bf82fd5487219011f5c6c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 19 Jul 2016 21:15:56 +0200
Subject: [PATCH 1/3] OSX travis

---
 .travis.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06f6aeda..87e24ea4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,13 @@
 language: cpp
-compiler:
-  - clang
-  - gcc
+matrix:
+  include:
+    - os: linux
+      compiler: gcc
+    - os: linux
+      compiler: clang
+    - os: osx
+      osx_image: xcode7
+      compiler: clang
 sudo: false
 addons:
   apt:
@@ -25,12 +31,15 @@ addons:
     - libcppunit-dev
 before_install:
   - $CC --version
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install --force cppunit gettext openssl gnutls libgcrypt gmp nettle libssh2 c-ares sqlite3 ; fi
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
   - $CC --version
 before_script:
   - autoreconf -i
   - automake
   - autoconf
-  - ./configure
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./configure --without-openssl --without-gnutls --with-appletls; fi
+  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then ./configure ; fi
 script:
   - make check

From 1d83f687dc6293bb4a1b1ff32ca0c32ca99caef5 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 19 Jul 2016 21:53:02 +0200
Subject: [PATCH 2/3] Force the link

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 87e24ea4..00585099 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ before_install:
   - $CC --version
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install --force cppunit gettext openssl gnutls libgcrypt gmp nettle libssh2 c-ares sqlite3 ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link --force cppunit gettext openssl gnutls libgcrypt gmp nettle libssh2 c-ares sqlite3 ; fi
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
   - $CC --version
 before_script:

From 18742ea800d1f89a00758e476a8d69e50b662e9c Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 19 Jul 2016 22:17:52 +0200
Subject: [PATCH 3/3] Disable nls in osx-travis

Weird linking problems
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 00585099..9cbcf90b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ before_script:
   - autoreconf -i
   - automake
   - autoconf
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./configure --without-openssl --without-gnutls --with-appletls; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./configure --without-openssl --without-gnutls --with-appletls --disable-nls ; fi
   - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then ./configure ; fi
 script:
   - make check