svn commit: r1102508 - in /trafficserver/traffic/trunk: CHANGES configure.ac proxy/Makefile.am

[zw...@apache.org]

Author: zwoop
Date: Thu May 12 23:31:25 2011
New Revision: 1102508

URL: http://svn.apache.org/viewvc?rev=1102508&view=rev
Log:
TS-774 Add new option, --enable-static-libts

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/proxy/Makefile.am

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1102508&r1=1102507&r2=1102508&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Thu May 12 23:31:25 2011
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache Traffic Server 2.1.9
+  *) [TS-774] Add a new configure option, --enable-static-libts,
+   which avoids the dynamic linking hassles involved with the
+   dynamic nature of libts. This is for devs only.
+
   *) [TS-773] Traffic server has a hard limit of 512 gigabytes per RAW
   disk partition. This fix required changing the disk structure which
   will result in a total disk cache clear (wipe) after upgrading.

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1102508&r1=1102507&r2=1102508&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Thu May 12 23:31:25 2011
@@ -258,6 +258,19 @@ AS_IF([test 0 -ne $has_standalone_iocore
 AM_CONDITIONAL([STANDALONE_IOCORE], [test 0 -ne $has_standalone_iocore])
 
 #
+# Force some static linkage (for testing / development only)
+#
+AC_MSG_CHECKING([whether to build some static libts (dev only)])
+AC_ARG_ENABLE([static-libts],
+  [AS_HELP_STRING([--enable-static-libts],[build some static libts (dev only)])],
+  [],
+  [enable_static_libts=no]
+)
+AC_MSG_RESULT([$enable_static_libts])
+TS_ARG_ENABLE_VAR([has],[static-libts])
+AM_CONDITIONAL([STATIC_LIBTS], [test 0 -ne $has_static_libts])
+
+#
 # Remote Coverity Prevent commit
 #
 AC_MSG_CHECKING([whether to commit cov defects to remote host])

Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=1102508&r1=1102507&r2=1102508&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Thu May 12 23:31:25 2011
@@ -54,6 +54,13 @@ EXTRA_PROGRAMS = \
 EXTRA_LIBRARIES	= \
   libTrafficServerStandalone.a
 
+if STATIC_LIBTS
+   which_libts = $(top_builddir)/lib/ts/.libs/libtsutil.a
+else
+   which_libts = $(top_builddir)/lib/ts/libtsutil.la
+endif
+
+
 EXTRA_DIST = InkAPITestTool.cc example_alarm_bin.sh example_prep.sh
 
 traffic_server_SOURCES = \
@@ -152,7 +159,7 @@ traffic_server_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/records/librecprocess.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
+  $(which_libts) \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
   @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ @LIBCAP@ \