summaryrefslogtreecommitdiff
path: root/modules/tls
diff options
context:
space:
mode:
authorMartin Kraemer <martin@apache.org>2001-04-27 08:41:01 +0000
committerMartin Kraemer <martin@apache.org>2001-04-27 08:41:01 +0000
commit87abf2a9d051ad7d2a8d3c493799a8c98fb79f88 (patch)
tree4a66e92b8420f37475f0e48a6b5a645a83fd6a23 /modules/tls
parent8271967b17a72ffd747f0a68490953a4582c563d (diff)
downloadhttpd-87abf2a9d051ad7d2a8d3c493799a8c98fb79f88.tar.gz
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
Diffstat (limited to 'modules/tls')
-rw-r--r--modules/tls/config.m49
1 files changed, 8 insertions, 1 deletions
diff --git a/modules/tls/config.m4 b/modules/tls/config.m4
index 0966fbacde..b80fe7271b 100644
--- 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