trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject [08/17] git commit: Setting rpath to reference value used when --with-openssl is specified, This closes #75
Date Wed, 18 Jun 2014 23:51:34 GMT
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/fdea7dc3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fdea7dc3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fdea7dc3

Branch: refs/heads/4.2.x
Commit: fdea7dc3c1b18fd3a3ad813878cc7dfb5304be7a
Parents: 24926f5
Author: Brian Geffon <briang@apache.org>
Authored: Wed May 21 13:50:37 2014 -0700
Committer: Brian Geffon <briang@apache.org>
Committed: Tue Jun 10 16:10:47 2014 -0700

----------------------------------------------------------------------
 build/ax_check_openssl.m4 | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fdea7dc3/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


Mime
View raw message