Author: zwoop
Date: Tue May 10 03:16:31 2011
New Revision: 1101295
URL: http://svn.apache.org/viewvc?rev=1101295&view=rev
Log:
TS-562 Make --with-openssl path be honored with an -rpath to libtool
Modified:
trafficserver/traffic/trunk/build/crypto.m4
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/cop/Makefile.am
trafficserver/traffic/trunk/example/app-template/Makefile.am
trafficserver/traffic/trunk/lib/ts/Makefile.am
trafficserver/traffic/trunk/mgmt/Makefile.am
trafficserver/traffic/trunk/mgmt/cli/Makefile.am
trafficserver/traffic/trunk/mgmt/tools/Makefile.am
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
trafficserver/traffic/trunk/test/deft/Makefile.am
Modified: trafficserver/traffic/trunk/build/crypto.m4
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/crypto.m4?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/crypto.m4 (original)
+++ trafficserver/traffic/trunk/build/crypto.m4 Tue May 10 03:16:31 2011
@@ -90,11 +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}])
- case $host_os in
- solaris*)
- TS_ADDTO(LDFLAGS, [-R${openssl_ldflags}])
- ;;
- esac
+ TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${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/configure.ac
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Tue May 10 03:16:31 2011
@@ -1139,6 +1139,7 @@ AC_MSG_NOTICE([Build using LDFLAGS=$LDFL
AC_MSG_NOTICE([Build using SHARED_LDFLAGS=$SHARED_LDFLAGS])
AC_MSG_NOTICE([Build using EXTRA_CC_LDFLAGS=$EXTRA_CC_LDFLAGS])
AC_MSG_NOTICE([Build using EXTRA_CXX_LDFLAGS=$EXTRA_CXX_LDFLAGS])
+AC_MSG_NOTICE([Build using LIBTOOL_LINK_FLAGS=$LIBTOOL_LINK_FLAGS])
AC_MSG_NOTICE([Build using MGMT_DEFS=$MGMT_DEFS])
AC_MSG_NOTICE([Build using API_DEFS=$API_DEFS])
@@ -1150,6 +1151,7 @@ AC_SUBST([CXXFLAGS])
AC_SUBST([EXPAT_LDFLAGS])
AC_SUBST([EXTRA_CC_LDFLAGS])
AC_SUBST([EXTRA_CXX_LDFLAGS])
+AC_SUBST([LIBTOOL_LINK_FLAGS])
AC_SUBST([iocore_include_dirs])
AC_SUBST([LDFLAGS])
AC_SUBST([MGMT_DEFS])
Modified: trafficserver/traffic/trunk/cop/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/cop/Makefile.am?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/cop/Makefile.am (original)
+++ trafficserver/traffic/trunk/cop/Makefile.am Tue May 10 03:16:31 2011
@@ -29,7 +29,7 @@ DEFS += $(MGMT_DEFS)
bin_PROGRAMS = traffic_cop
traffic_cop_SOURCES = TrafficCop.cc
-traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_cop_LDADD = \
$(top_builddir)/mgmt/api/remote/libtsmgmt.la \
$(top_builddir)/lib/ts/libtsutil.la \
Modified: trafficserver/traffic/trunk/example/app-template/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/app-template/Makefile.am?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/app-template/Makefile.am (original)
+++ trafficserver/traffic/trunk/example/app-template/Makefile.am Tue May 10
03:16:31 2011
@@ -27,7 +27,7 @@ bin_PROGRAMS = tsapp
tsapp_SOURCES = app-template.cc
-tsapp_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+tsapp_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
tsapp_LDADD = \
$(top_builddir)/proxy/libTrafficServerStandalone.a \
$(top_builddir)/proxy/hdrs/libhdrs.a \
Modified: trafficserver/traffic/trunk/lib/ts/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/Makefile.am?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/Makefile.am (original)
+++ trafficserver/traffic/trunk/lib/ts/Makefile.am Tue May 10 03:16:31 2011
@@ -160,15 +160,15 @@ mkdfa_SOURCES = mkdfa.c
test_atomic_SOURCES = test_atomic.cc
test_atomic_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@
-test_atomic_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+test_atomic_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_freelist_SOURCES = test_freelist.cc
test_freelist_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@
@LIBEXECINFO@
-test_freelist_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+test_freelist_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_arena_SOURCES = test_arena.cc
test_arena_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@
-test_arena_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+test_arena_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_List_SOURCES = test_List.cc
test_Map_SOURCES = test_Map.cc
Modified: trafficserver/traffic/trunk/mgmt/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/Makefile.am?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/Makefile.am Tue May 10 03:16:31 2011
@@ -84,7 +84,7 @@ traffic_manager_SOURCES = \
Rollback.cc \
Rollback.h
-traffic_manager_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @EXPAT_LDFLAGS@
+traffic_manager_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @EXPAT_LDFLAGS@
@LIBTOOL_LINK_FLAGS@
traffic_manager_LDADD = \
cluster/libcluster.a \
stats/libstats.a \
Modified: trafficserver/traffic/trunk/mgmt/cli/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/Makefile.am?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/cli/Makefile.am Tue May 10 03:16:31 2011
@@ -70,7 +70,7 @@ libtrafficshell_a_SOURCES = \
UtilCmds.cc \
UtilCmds.h
-traffic_shell_LDFLAGS = $(EXTRA_CXX_LDFLAGS)
+traffic_shell_LDFLAGS = $(EXTRA_CXX_LDFLAGS) @LIBTOOL_LINK_FLAGS@
traffic_shell_LDADD = \
libtrafficshell.a \
$(top_builddir)/mgmt/api/remote/libtsmgmt.la \
@@ -81,7 +81,7 @@ traffic_shell_LDADD = \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
@LIBRT@ @LIBEXECINFO@ @LIBPCRE@
-traffic_line_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_line_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_line_LDADD = \
$(top_builddir)/mgmt/api/remote/libtsmgmt.la \
$(top_builddir)/lib/ts/libtsutil.la \
Modified: trafficserver/traffic/trunk/mgmt/tools/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/tools/Makefile.am?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/tools/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/tools/Makefile.am Tue May 10 03:16:31 2011
@@ -31,7 +31,7 @@ noinst_PROGRAMS = traffic_shmem_clean
noinst_LIBRARIES = libinksysapi.a libinkconfigapi.a
traffic_shmem_clean_SOURCES = ShmemClean.cc
-traffic_shmem_clean_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_shmem_clean_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
libinksysapi_a_SOURCES = SysAPI.cc SysAPI.h
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Tue May 10 03:16:31 2011
@@ -128,7 +128,7 @@ if BUILD_TESTS
TestHook.cc
endif
-traffic_server_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_server_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_server_LDADD = \
http/libhttp.a \
http/remap/libhttp_remap.a \
@@ -159,7 +159,7 @@ traffic_server_LDADD = \
@LIBMLD@ @LIBEXC@ -lm @LIBEV@ @LIBPROFILER@ @LIBEXECINFO@
traffic_logcat_SOURCES = logcat.cc
-traffic_logcat_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_logcat_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_logcat_LDADD = \
signals.o \
InkXml.o \
@@ -182,7 +182,7 @@ if BUILD_TESTS
endif
traffic_logstats_SOURCES = logstats.cc
-traffic_logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_logstats_LDADD = \
signals.o \
InkXml.o \
@@ -200,7 +200,7 @@ traffic_logstats_LDADD = \
@LIBEXECINFO@
traffic_sac_SOURCES = sac.cc
-traffic_sac_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_sac_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_sac_LDADD = \
ICP.o \
ICPConfig.o \
Modified: trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/Makefile.am?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/Makefile.am Tue May 10 03:16:31 2011
@@ -55,4 +55,4 @@ load_http_hdr_SOURCES = \
load_http_hdr_LDADD = -L. -lhdrs \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBTCL@ @LIBRT@ @LIBTHREAD@
-load_http_hdr_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+load_http_hdr_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
Modified: trafficserver/traffic/trunk/test/deft/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/Makefile.am?rev=1101295&r1=1101294&r2=1101295&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/Makefile.am (original)
+++ trafficserver/traffic/trunk/test/deft/Makefile.am Tue May 10 03:16:31 2011
@@ -26,7 +26,7 @@ proc_manager_SOURCES = proc_manager.cc \
sio_raf_server.cc \
test_utils.cc
-proc_manager_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+proc_manager_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
proc_manager_LDADD = $(top_builddir)/lib/ts/libtsutil.la \
@LIBSOCKET@ @LIBNSL@ \
@LIBRESOLV@ @LIBRT@ @LIBTHREAD@ -lm @LIBDL@
@@ -40,7 +40,7 @@ test_log_collate_SOURCES = test_log_coll
sio_raf_server.cc \
test_utils.cc
-test_log_collate_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+test_log_collate_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_log_collate_LDADD = $(top_builddir)/lib/ts/libtsutil.la \
@LIBSOCKET@ @LIBNSL@ \
@LIBRESOLV@ @LIBRT@ @LIBTHREAD@ -lm @LIBDL@
@@ -56,7 +56,7 @@ test_exec_SOURCES = test_exec.cc \
test_results.cc \
test_utils.cc
-test_exec_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+test_exec_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_exec_LDADD = $(top_builddir)/lib/ts/libtsutil.a \
-L/usr/local/lib \
$(top_builddir)/f_pkg/misc/perl5.6.1/lib/DynaLoader.a \
