Author: markt
Date: Mon Jan 30 22:17:22 2017
New Revision: 1781002
URL: http://svn.apache.org/viewvc?rev=1781002&view=rev
Log:
Use ssllibdir rather than libdir to avoid naming clash on Linux
Modified:
tomcat/native/trunk/native/build/tcnative.m4
Modified: tomcat/native/trunk/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=1781002&r1=1781001&r2=1781002&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Mon Jan 30 22:17:22 2017
@@ -210,19 +210,19 @@ case "$use_openssl" in
TCN_OPENSSL_LIBS="-lssl -lcrypto"
else
TCN_OPENSSL_INC="-I$use_openssl/include"
- test -d $use_openssl/lib64 && libdir=lib64 || libdir=lib
+ test -d $use_openssl/lib64 && ssllibdir=lib64 || ssllibdir=lib
case $host in
*-solaris*)
- TCN_OPENSSL_LIBS="-L$use_openssl/$libdir
-R$use_openssl/$libdir -lssl -lcrypto"
+ TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir
-R$use_openssl/$ssllibdir -lssl -lcrypto"
;;
*-hp-hpux*)
- TCN_OPENSSL_LIBS="-L$use_openssl/$libdir -Wl,+b: -lssl
-lcrypto"
+ TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir -Wl,+b: -lssl
-lcrypto"
;;
*linux*)
- TCN_OPENSSL_LIBS="-L$use_openssl/$libdir
-Wl,-rpath,$use_openssl/$libdir -lssl -lcrypto"
+ TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir
-Wl,-rpath,$use_openssl/$ssllibdir -lssl -lcrypto"
;;
*)
- TCN_OPENSSL_LIBS="-L$use_openssl/$libdir -lssl -lcrypto"
+ TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir -lssl -lcrypto"
;;
esac
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
