Author: zwoop
Date: Tue May 10 03:26:32 2011
New Revision: 1101297
URL: http://svn.apache.org/viewvc?rev=1101297&view=rev
Log:
TS-562 Make --with-pcre path be honored with an -rpath to libtool
Make --with-zlib path be honored with an -rpath to libtool
Make --with-expath path be honored with an -rpath to libtool
Make --with-lzma path be honored with an -rpath to libtool
Modified:
trafficserver/traffic/trunk/build/lzma.m4
trafficserver/traffic/trunk/build/pcre.m4
trafficserver/traffic/trunk/build/xml.m4
trafficserver/traffic/trunk/build/zlib.m4
Modified: trafficserver/traffic/trunk/build/lzma.m4
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/lzma.m4?rev=1101297&r1=1101296&r2=1101297&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/lzma.m4 (original)
+++ trafficserver/traffic/trunk/build/lzma.m4 Tue May 10 03:26:32 2011
@@ -82,11 +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}])
- case $host_os in
- solaris*)
- TS_ADDTO(LDFLAGS, [-R${lzma_ldflags}])
- ;;
- esac
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${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=1101297&r1=1101296&r2=1101297&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/pcre.m4 (original)
+++ trafficserver/traffic/trunk/build/pcre.m4 Tue May 10 03:26:32 2011
@@ -83,11 +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}])
- case $host_os in
- solaris*)
- TS_ADDTO(LDFLAGS, [-R${pcre_ldflags}])
- ;;
- esac
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${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=1101297&r1=1101296&r2=1101297&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/xml.m4 (original)
+++ trafficserver/traffic/trunk/build/xml.m4 Tue May 10 03:26:32 2011
@@ -90,11 +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}])
- case $host_os in
- solaris*)
- TS_ADDTO(LDFLAGS, [-R${expat_ldflags}])
- ;;
- esac
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${expat_ldflags}])
fi
AC_CHECK_LIB(expat, XML_SetUserData, [expat_have_libs=1])
if test "$expat_have_libs" != "0"; then
Modified: trafficserver/traffic/trunk/build/zlib.m4
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/zlib.m4?rev=1101297&r1=1101296&r2=1101297&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/zlib.m4 (original)
+++ trafficserver/traffic/trunk/build/zlib.m4 Tue May 10 03:26:32 2011
@@ -82,11 +82,7 @@ if test "$enable_zlib" != "no"; then
if test "$zlib_base_dir" != "/usr"; then
TS_ADDTO(CPPFLAGS, [-I${zlib_include}])
TS_ADDTO(LDFLAGS, [-L${zlib_ldflags}])
- case $host_os in
- solaris*)
- TS_ADDTO(LDFLAGS, [-R${zlib_ldflags}])
- ;;
- esac
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${zlib_ldflags}])
fi
AC_CHECK_LIB(z, compressBound, [zlib_have_libs=1])
if test "$zlib_have_libs" != "0"; then
