[trafficserver] 08/09: add openssh flags that we need to build plugins with custom SSL correctly

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 71310969dc7cb987b2999b9efffdea9073cec577
Author: Jason Kenny <dr...@live.com>
AuthorDate: Mon Jan 8 10:46:11 2018 -0600

    add openssh flags that we need to build plugins with custom SSL correctly
    
    fix flags used
    
    (cherry picked from commit e779edbaf4a825ef7044a42b0691abfa80c8ef10)
---
 tools/tsxs.in | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/tsxs.in b/tools/tsxs.in
index 8d529af..405589f 100755
--- a/tools/tsxs.in
+++ b/tools/tsxs.in
@@ -24,9 +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@ @OPENSSL_LIBS@"
 BUILD=
 DEBUGECHO=
 LDFLAGS="$LDFLAGS @LDFLAGS@"
@@ -77,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@ ;;
@@ -144,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
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.