This is an automated email from the ASF dual-hosted git repository.
dragon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 2354e7a add openssh flags that we need to build plugins with custom
SSL correctly
2354e7a is described below
commit 2354e7a56eec9db7d827a6874d9357371a7b986e
Author: Jason Kenny <[email protected]>
AuthorDate: Fri Nov 17 13:29:13 2017 -0600
add openssh flags that we need to build plugins with custom SSL correctly
fix flags used
---
tools/tsxs.in | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tools/tsxs.in b/tools/tsxs.in
index c83d656..c2e4e37 100755
--- a/tools/tsxs.in
+++ b/tools/tsxs.in
@@ -24,10 +24,10 @@ localstatedir="@localstatedir@"
INSTALLDIR=`eval echo "@libexecdir@"`
INCLUDEDIR=`eval echo "@includedir@"`
-CPPFLAGS="$CPPFLAGS -I$INCLUDEDIR"
+CPPFLAGS="$CPPFLAGS -I$INCLUDEDIR @OPENSSL_INCLUDES@"
CFLAGS="$CFLAGS @AM_CFLAGS@"
CXXFLAGS="$CXXFLAGS @AM_CXXFLAGS@"
-LIBS="$LIBS @LIBS@"
+LIBS="$LIBS @LIBS@ @OPENSSL_LIBS@"
BUILD=
DEBUGECHO=
@@ -78,8 +78,11 @@ query() {
case $1 in
CC) echo @CC@ ;;
CXX) echo @CXX@ ;;
- CFLAGS) echo @AM_CFLAGS@ ;;
- CXXFLAGS) echo @AM_CXXFLAGS@ ;;
+ CFLAGS) echo $CFLAGS ;;
+ CXXFLAGS) echo $CXXFLAGS ;;
+ CPPFLAGS) echo $CPPFLAGS ;;
+ LIBS) echo $LIBS ;;
+ LDFLAGS) echo $LDFLAGS ;;
PREFIX) echo @prefix@ ;;
SYSCONFDIR) echo @sysconfdir@ ;;
INCLUDEDIR) echo @includedir@ ;;
@@ -145,7 +148,7 @@ case $host in
NOWHOLE_ARCHIVE="-Wl,-z -Wl,defaultextract"
;;
*-*-linux*)
- LDFLAGS="$LDFLAGS -Wl,-E"
+ LDFLAGS="$LDFLAGS @OPENSSL_LDFLAGS@ -Wl,-E"
CPPFLAGS="$CPPFLAGS"
PICFLAGS="-fpic"
MODULELD="$CC -shared"
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
