[80222] trunk/base

[jmr at macports.org]

Revision: 80222
          http://trac.macports.org/changeset/80222
Author:   jmr at macports.org
Date:     2011-07-07 00:29:59 -0700 (Thu, 07 Jul 2011)
Log Message:
-----------
apparently bash needs an extra eval to expand both a variable and a tilde

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2011-07-07 07:21:28 UTC (rev 80221)
+++ trunk/base/aclocal.m4	2011-07-07 07:29:59 UTC (rev 80222)
@@ -335,7 +335,7 @@
 
 		# Set Tcl package directory to ~/Library/Tcl
 	    AC_MSG_CHECKING(for Tcl package directory)
-		ac_cv_c_tclpkgd=`echo ~$DSTUSR/Library/Tcl`
+		ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
 	    # Convert to a native path and substitute into the output files.
 	    PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}`
 	    TCL_PACKAGE_DIR=${PACKAGE_DIR_NATIVE}
@@ -646,7 +646,7 @@
 			        fi
 			    fi
 			elif test "$path" = "~/Library/Tcl"; then
-			    ac_cv_c_tclpkgd=`echo ~$DSTUSR/Library/Tcl`
+			    ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
 			    break
 			fi
 			done

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2011-07-07 07:21:28 UTC (rev 80221)
+++ trunk/base/configure	2011-07-07 07:29:59 UTC (rev 80222)
@@ -7742,7 +7742,7 @@
 		# Set Tcl package directory to ~/Library/Tcl
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl package directory" >&5
 $as_echo_n "checking for Tcl package directory... " >&6; }
-		ac_cv_c_tclpkgd=`echo ~$DSTUSR/Library/Tcl`
+		ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
 	    # Convert to a native path and substitute into the output files.
 	    PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}`
 	    TCL_PACKAGE_DIR=${PACKAGE_DIR_NATIVE}
@@ -9205,7 +9205,7 @@
 			        fi
 			    fi
 			elif test "$path" = "~/Library/Tcl"; then
-			    ac_cv_c_tclpkgd=`echo ~$DSTUSR/Library/Tcl`
+			    ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
 			    break
 			fi
 			done
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110707/72bae4d9/attachment-0001.html>