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/03/25 21:14:19 UTC

svn commit: r1085548 - in /trafficserver/traffic/trunk: .gitignore configure.ac

Author: zwoop
Date: Fri Mar 25 20:14:19 2011
New Revision: 1085548

URL: http://svn.apache.org/viewvc?rev=1085548&view=rev
Log:
TS-562 Fix TCL linking to honor custom library dirs.

Author: Eric Connell

Modified:
    trafficserver/traffic/trunk/.gitignore
    trafficserver/traffic/trunk/configure.ac

Modified: trafficserver/traffic/trunk/.gitignore
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/.gitignore?rev=1085548&r1=1085547&r2=1085548&view=diff
==============================================================================
--- trafficserver/traffic/trunk/.gitignore (original)
+++ trafficserver/traffic/trunk/.gitignore Fri Mar 25 20:14:19 2011
@@ -45,8 +45,8 @@ lib/ts/test_List
 lib/ts/test_arena
 lib/ts/test_atomic
 lib/ts/test_freelist
-proxy/config/records.config
-proxy/config/storage.config
+proxy/config/records.config.default
+proxy/config/storage.config.default
 
 mgmt/api/remote/traffic_api_cli_remote
 mgmt/tools/traffic_mcast_snoop

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1085548&r1=1085547&r2=1085548&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Fri Mar 25 20:14:19 2011
@@ -754,12 +754,12 @@ SC_LOAD_TCLCONFIG
 # expect tclConfig.sh to populate TCL_LIB_FLAG and TCL_INCLUDE_SPEC
 case $host_os in
   darwin*)
-    TCL_LIB_FLAG="-ltcl" # OSX fails to populate this variable
+    TCL_LIB_SPEC="-ltcl" # OSX fails to populate this variable
     ;;
   *)
    ;;
 esac
-AC_SUBST([LIBTCL],[$TCL_LIB_FLAG])
+AC_SUBST([LIBTCL],[$TCL_LIB_SPEC])
 
 case $host_os in
   freebsd*)