Update OpenSSL detection to work on Darwin.

Submitted by:	Sander Temme <sctemme@covalent.net>
Reviewed by:	Dirk, Justin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96726 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a4773a25945aca197bb2b06842c3466509175d8e..dcc8bda723686a79969a96f3ac784621ab0141f1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.41
 
+  *) Update OpenSSL detection to work on Darwin.
+     [Sander Temme <sctemme@covalent.net>]
+
   *) Update the xslt and css to give the documentation a more
      modern style.
      [André Malo <nd@perlig.de>, Gernot Winkler <greh@o3media.de>]

diff --git a/acinclude.m4 b/acinclude.m4
index 9d94a521d92f3407b993d0fd69b7eb0606c3389e..ed3964886fc2959f50a950c93b39644f464c0c7e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -461,7 +461,7 @@ if test "x$ap_ssltk_base" = "x"; then
   ap_ssltk_libdir=""
   for p in $ap_ssltk_base/lib /usr/local/openssl/lib \
            /usr/local/ssl/lib /usr/local/lib /usr/lib /lib /usr/lib64; do
-    if test -f "$p/libssl.a" -o -f "$p/libssl.so"; then
+    if test -f "$p/libssl.a" -o -f "$p/libssl.so" -o -f "$p/libssl.dylib"; then
       ap_ssltk_libdir="$p"
       break
     fi