Search for OpenSSL in the "standard locations" .../include and .../lib

which are ubiquitous after openSSL's "make install". The old logic relied
on a common directory for both include files and libraries (very non-standard).

Submitted by:	Clere Jean-Frederic <JFrederic.Clere@fujitsu-siemens.com>

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

diff --git a/modules/tls/config.m4 b/modules/tls/config.m4
index 0966fbacde64e5dd6c6cb573a6d56834e550ffca..b80fe7271bf7d5417122f6ca2cd5832c451663eb 100644 (file)
--- a/modules/tls/config.m4
+++ b/modules/tls/config.m4
@@ -24,7 +24,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/include/openssl/ssl.h"
+                  if test -f $searchfile ; then
+                      INCLUDES="$INCLUDES -I$withval/include"
+                      LIBS="$LIBS -L$withval/lib -lssl -lcrypto"
+                      ssl_lib="OpenSSL"
+                  else
+                      AC_MSG_ERROR(no - Unable to locate $withval/inc/ssl.h)
+                  fi
               fi
           fi
       fi