Allow mod_tls to compile on Unix boxes where openssl has already been

installed.
Submitted by:	Gomez Henri <new-httpd@slib.fr>
Reviewed by:	Ryan Bloom

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

diff --git a/CHANGES b/CHANGES
index 8e68946ab64a43e1051ba47c19bc3519f5fdaf09..6e6b9c2c643597a504a48326d7f495d7aff8b6aa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0b1
 
+  *) Allow mod_tls to compile under Unix boxes where openssl has been
+     installed to the system include files.
+     [Gomez Henri <new-httpd@slib.fr>]
+
   *) Cleanup the mod_tls configure process.  This should remove any need
      to hand-edit any files.  We require OpenSSL 0.9.6 or later, but 
      configure doesn't check that yet.  [Ryan Bloom]

diff --git a/modules/tls/config.m4 b/modules/tls/config.m4
index df3ecbf41e77c57739a5a0aa63941a9c6e6a9621..0966fbacde64e5dd6c6cb573a6d56834e550ffca 100644 (file)
--- a/modules/tls/config.m4
+++ b/modules/tls/config.m4
@@ -18,7 +18,14 @@ APACHE_MODULE(tls, TLS/SSL support, $tls_objs, , no, [
               LIBS="$LIBS -L$withval -lssl -lcrypto"
               ssl_lib="OpenSSL"
           else
-              AC_MSG_ERROR(no - Unable to locate $withval/inc/ssl.h)
+              searchfile="$withval/openssl/ssl.h"
+              if test -f $searchfile ; then
+                  INCLUDES="$INCLUDES -I$withval/openssl"
+                  LIBS="$LIBS -L$withval -lssl -lcrypto"
+                  ssl_lib="OpenSSL"
+              else
+                  AC_MSG_ERROR(no - Unable to locate $withval/inc/ssl.h)
+              fi
           fi
       fi
       AC_MSG_RESULT(found $ssl_lib)