[Travis] bring up to date

pull in recent patches from master

.travis.yml

@@ -1,10 +1,34 @@
 language: cpp
-before_install:
+
-- sudo apt-get update -qq
+matrix:
-- sudo apt-get install -qq libxtst-dev
+  include:
-- sudo apt-get install -qq qtdeclarative5-dev
+    - os: linux
-- sudo apt-get install -qq libavahi-compat-libdnssd-dev
+      sudo: false
-script: sh -x ./clean_build.sh
+      dist: trusty
-# skip install phase since we have a customized install package
+      addons:
-# creation tool for each supported platform
+        apt:
+          packages:
+            - libxtst-dev
+            - qtdeclarative5-dev
+            - libavahi-compat-libdnssd-dev
+      script: sh -x ./clean_build.sh
+
+    - os: osx
+      osx_image: xcode9
+      script:
+        - export COLUMNS=80
+        - curl -LO https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci
+        - chmod +x ./macports-ci
+        - ./macports-ci install
+        - PATH="$PATH:/opt/local/bin"
+        - sudo port -N install qt5-qtbase openssl
+        - sh -x ./clean_build.sh
+
+    - os: osx
+      osx_image: xcode9
+      script:
+        - brew update
+        - brew install qt openssl
+        - sh -x ./clean_build.sh
+
 install: true

CMakeLists.txt

@@ -63,6 +63,7 @@ if (UNIX)
     include (CheckIncludeFileCXX)
     include (CheckSymbolExists)
     include (CheckCSourceCompiles)
+    include (FindPkgConfig)
 
     check_include_file_cxx (istream HAVE_ISTREAM)
     check_include_file_cxx (ostream HAVE_OSTREAM)
@@ -162,6 +163,11 @@ if (UNIX)
             include_directories("/usr/local/include" "/usr/local/include/avahi-compat-libdns_sd")
             link_directories("/usr/local/lib")
         endif()
+	if (${PKG_CONFIG_FOUND})
+		pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd)
+		include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS})
+		set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${AVAHI_COMPAT_INCLUDE_DIRS}")
+	endif ()
 
         set (XKBlib "X11/Xlib.h;X11/XKBlib.h")
         set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")