You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2011/05/27 04:07:56 UTC
svn commit: r1128137 - in /trafficserver/traffic/trunk/build: crypto.m4
lzma.m4 pcre.m4 xml.m4
Author: zwoop
Date: Fri May 27 02:07:55 2011
New Revision: 1128137
URL: http://svn.apache.org/viewvc?rev=1128137&view=rev
Log:
TS-806 TS_ADDTO removes duplicates, so avoid this by using the -R option to libtool
Modified:
trafficserver/traffic/trunk/build/crypto.m4
trafficserver/traffic/trunk/build/lzma.m4
trafficserver/traffic/trunk/build/pcre.m4
trafficserver/traffic/trunk/build/xml.m4
Modified: trafficserver/traffic/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/crypto.m4?rev=1128137&r1=1128136&r2=1128137&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/crypto.m4 (original)
+++ trafficserver/traffic/trunk/build/crypto.m4 Fri May 27 02:07:55 2011
@@ -90,7 +90,7 @@ if test "$enable_openssl" != "no"; then
if test "$openssl_base_dir" != "/usr"; then
TS_ADDTO(CPPFLAGS, [-I${openssl_include}])
TS_ADDTO(LDFLAGS, [-L${openssl_ldflags}])
- TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${openssl_ldflags}])
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${openssl_ldflags}])
fi
AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
if test "$openssl_have_libs" != "0"; then
Modified: trafficserver/traffic/trunk/build/lzma.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/lzma.m4?rev=1128137&r1=1128136&r2=1128137&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/lzma.m4 (original)
+++ trafficserver/traffic/trunk/build/lzma.m4 Fri May 27 02:07:55 2011
@@ -82,7 +82,7 @@ if test "$enable_lzma" != "no"; then
if test "$lzma_base_dir" != "/usr"; then
TS_ADDTO(CPPFLAGS, [-I${lzma_include}])
TS_ADDTO(LDFLAGS, [-L${lzma_ldflags}])
- TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${zma_ldflags}])
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${zma_ldflags}])
fi
AC_CHECK_LIB(lzma, lzma_code, [lzma_have_libs=1])
if test "$lzma_have_libs" != "0"; then
Modified: trafficserver/traffic/trunk/build/pcre.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/pcre.m4?rev=1128137&r1=1128136&r2=1128137&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/pcre.m4 (original)
+++ trafficserver/traffic/trunk/build/pcre.m4 Fri May 27 02:07:55 2011
@@ -83,7 +83,7 @@ if test "$enable_pcre" != "no"; then
if test "$pcre_base_dir" != "/usr"; then
TS_ADDTO(CPPFLAGS, [-I${pcre_include}])
TS_ADDTO(LDFLAGS, [-L${pcre_ldflags}])
- TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${pcre_ldflags}])
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${pcre_ldflags}])
fi
AC_CHECK_LIB(pcre, pcre_exec, [pcre_have_libs=1])
if test "$pcre_have_libs" != "0"; then
Modified: trafficserver/traffic/trunk/build/xml.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/xml.m4?rev=1128137&r1=1128136&r2=1128137&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/xml.m4 (original)
+++ trafficserver/traffic/trunk/build/xml.m4 Fri May 27 02:07:55 2011
@@ -90,7 +90,7 @@ if test "$enable_expat" != "no"; then
if test "$expat_base_dir" != "/usr"; then
TS_ADDTO(CPPFLAGS, [-I${expat_include}])
TS_ADDTO(LDFLAGS, [-L${expat_ldflags}])
- TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${expat_ldflags}])
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${expat_ldflags}])
fi
AC_CHECK_LIB(expat, XML_SetUserData, [expat_have_libs=1])
if test "$expat_have_libs" != "0"; then