Merge branch 'develop' of github.com:eclipse/paho.mqtt.c into develop

.travis.yml

@@ -8,8 +8,11 @@ os:
   - linux
   - osx
 
+sudo: required
+
 script:
   - make
   
 before_install:
-  - ./travis-install.sh
+  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CFLAGS="-I/usr/local/opt/openssl/include $CFLAGS" LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"; fi'
+

travis-install.sh

@@ -8,5 +8,6 @@ fi
 
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
 	brew update
-	brew install openssl 
+	brew install openssl
+	export CFLAGS="-I/usr/local/opt/openssl/include $CFLAGS" LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
 fi