TS-2504: detect OpenSSL library in 64 bit library paths
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1ae99c02 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1ae99c02 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1ae99c02 Branch: refs/heads/5.0.x Commit: 1ae99c020e2234152b735539fbb79509188b249c Parents: 6d3670b Author: Yunkai Zhang <[email protected]> Authored: Sat Jan 18 21:23:38 2014 -0800 Committer: James Peach <[email protected]> Committed: Tue Jan 21 15:46:47 2014 -0800 ---------------------------------------------------------------------- CHANGES | 2 ++ build/ax_check_openssl.m4 | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1ae99c02/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index dbec535..5e1075e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + *) [TS-2504] Support OpenSSL installations that use the lib64 directory. + *) [TS-799] Have AdminClient.pm created from .in file. *) [TS-2509] Add the const qualifier to pure HttpTunnel member functions. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1ae99c02/build/ax_check_openssl.m4 ---------------------------------------------------------------------- diff --git a/build/ax_check_openssl.m4 b/build/ax_check_openssl.m4 index 85605b1..b3f371b 100644 --- a/build/ax_check_openssl.m4 +++ b/build/ax_check_openssl.m4 @@ -78,7 +78,11 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ AC_MSG_CHECKING([for openssl/ssl.h in $ssldir]) if test -f "$ssldir/include/openssl/ssl.h"; then OPENSSL_INCLUDES="-I$ssldir/include" - OPENSSL_LDFLAGS="-L$ssldir/lib" + if test -d "$withval/lib64"; then + OPENSSL_LDFLAGS="-L$ssldir/lib64" + else + OPENSSL_LDFLAGS="-L$ssldir/lib" + fi OPENSSL_LIBS="-lssl -lcrypto" found=true AC_MSG_RESULT([yes])
