You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/05/21 22:50:56 UTC
[1/2] git commit: Setting rpath to reference value used when
--with-openssl is specified, This closes #75
Repository: trafficserver
Updated Branches:
refs/heads/master 2a0ef8a0e -> ea0a9b1b7
Setting rpath to reference value used when --with-openssl is specified, This closes #75
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/42772cfa
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/42772cfa
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/42772cfa
Branch: refs/heads/master
Commit: 42772cfa4d9cc811dd53a11663a2286a22e4df8f
Parents: 88fc99a
Author: Brian Geffon <br...@apache.org>
Authored: Wed May 21 13:50:37 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Wed May 21 13:50:37 2014 -0700
----------------------------------------------------------------------
build/ax_check_openssl.m4 | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/42772cfa/build/ax_check_openssl.m4
----------------------------------------------------------------------
diff --git a/build/ax_check_openssl.m4 b/build/ax_check_openssl.m4
index e0c4029..b490c91 100644
--- a/build/ax_check_openssl.m4
+++ b/build/ax_check_openssl.m4
@@ -37,6 +37,7 @@
AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
AC_DEFUN([AX_CHECK_OPENSSL], [
found=false
+ overriden_with_ssl=false
AC_ARG_WITH([openssl],
[AS_HELP_STRING([--with-openssl=DIR],
[root of the OpenSSL directory])],
@@ -46,6 +47,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
AC_MSG_ERROR([Invalid --with-openssl value])
;;
*) ssldirs="$withval"
+ overriden_with_ssl=true
;;
esac
], [
@@ -80,8 +82,14 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
OPENSSL_INCLUDES="-I$ssldir/include"
if test -d "$ssldir/lib64"; then
OPENSSL_LDFLAGS="-L$ssldir/lib64"
+ if test "$overriden_with_ssl"; then
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${ssldir}/lib64])
+ fi
else
OPENSSL_LDFLAGS="-L$ssldir/lib"
+ if test "$overriden_with_ssl"; then
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${ssldir}/lib])
+ fi
fi
OPENSSL_LIBS="-lssl -lcrypto"
found=true
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by br...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ea0a9b1b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ea0a9b1b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ea0a9b1b
Branch: refs/heads/master
Commit: ea0a9b1b7a4db07930fde593ac28397f4f6acea3
Parents: 42772cf 2a0ef8a
Author: Brian Geffon <br...@apache.org>
Authored: Wed May 21 13:50:50 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Wed May 21 13:50:50 2014 -0700
----------------------------------------------------------------------
CHANGES | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------