Make Mac OSX find OpenSSL

diff --git a/.travis.yml b/.travis.yml
index 9b3aac798b19cbfdf6e1c6edc8457f81f3be0b3a..3adc467663d037f39cb3895a0223835d37914827 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,12 @@ addons:
       - doxygen
       - graphviz
       - indent
+  homebrew:
+    packages:
+      - gnu-indent
+      - doxygen
+      - openssl
+      - indent
 matrix:
   include:
     - os: linux

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index 8eccc15b0d80874b9bb2700fd0cb72094a8adbc2..13736ee1bf55879935789a1f7b214554cc3809d0 100644 (file)
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -646,7 +646,7 @@ AC_DEFUN([ACX_SSL_CHECKS], [
     if test x_$withval != x_no; then
         AC_MSG_CHECKING(for SSL)
         if test x_$withval = x_ -o x_$withval = x_yes; then
-            withval="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr"
+            withval="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/local/opt/openssl /usr/sfw /usr"
         fi
         for dir in $withval; do
             ssldir="$dir"
@@ -751,7 +751,7 @@ AC_DEFUN([ACX_WITH_SSL],
 [
 AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
                                     [enable SSL (will check /usr/local/ssl
-                            /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr)]),[
+                            /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/local/opt/openssl /usr/sfw /usr)]),[
         ],[
             withval="yes"
         ])
@@ -770,7 +770,7 @@ AC_DEFUN([ACX_WITH_SSL_OPTIONAL],
 [
 AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
                                 [enable SSL (will check /usr/local/ssl
-                                /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr)]),[
+                                /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/local/opt/openssl /usr/sfw /usr)]),[
         ],[
             withval="yes"
         ])