[Sumover-dev] [svn commit] r4167 - rat/trunk

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Fri May 30 12:24:02 2008
New Revision: 4167

Modified:
   rat/trunk/configure
   rat/trunk/tcl.m4

Log:
sync with VIC's tcl.m4
contains fix so that tcl/tkConfig.sh is found on Ubuntu systems


Modified: rat/trunk/configure
==============================================================================
--- rat/trunk/configure	(original)
+++ rat/trunk/configure	Fri May 30 12:24:02 2008
@@ -6666,6 +6666,7 @@
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib/tcl[8-9].[0-9]* 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig=`(cd $i; pwd)`
@@ -6885,6 +6886,7 @@
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib/tk[8-9].[0-9]* 2>/dev/null` \
 			; do
 		    if test -f "$i/tkConfig.sh" ; then
 			ac_cv_c_tkconfig=`(cd $i; pwd)`

Modified: rat/trunk/tcl.m4
==============================================================================
--- rat/trunk/tcl.m4	(original)
+++ rat/trunk/tcl.m4	Fri May 30 12:24:02 2008
@@ -91,6 +91,7 @@
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib/tcl[[8-9]].[[0-9]]* 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig=`(cd $i; pwd)`
@@ -221,6 +222,7 @@
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib/tk[[8-9]].[[0-9]]* 2>/dev/null` \
 			; do
 		    if test -f "$i/tkConfig.sh" ; then
 			ac_cv_c_tkconfig=`(cd $i; pwd)`