[33606] trunk/base

[afb at macports.org]

Revision: 33606
          http://trac.macosforge.org/projects/macports/changeset/33606
Author:   afb at macports.org
Date:     2008-01-31 04:54:21 -0800 (Thu, 31 Jan 2008)

Log Message:
-----------
default tclpackage to ~/Library/Tcl when not installing as root

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

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2008-01-31 12:12:56 UTC (rev 33605)
+++ trunk/base/aclocal.m4	2008-01-31 12:54:21 UTC (rev 33606)
@@ -592,6 +592,8 @@
 #------------------------------------------------------------------------
 
 AC_DEFUN(MP_TCL_PACKAGE_DIR, [
+	AC_REQUIRE([MP_CHECK_INSTALLUSER])
+
     AC_MSG_CHECKING(for Tcl package directory)
 
     AC_ARG_WITH(tclpackage, [  --with-tclpackage       Tcl package installation directory.], with_tclpackagedir=${withval})
@@ -611,6 +613,7 @@
 		    darwin*)
 		    	tcl_autopath=`echo 'puts -nonewline \$auto_path' | $TCLSH`
 			for path in $tcl_autopath; do
+			if test "$DSTUSR" = "root" ; then
 			    if test "$path" = "/Library/Tcl"; then
 				ac_cv_c_tclpkgd="$path"
 				break
@@ -621,6 +624,10 @@
 				    break
 			        fi
 			    fi
+			elif test "$path" = "~/Library/Tcl"; then
+			    ac_cv_c_tclpkgd="~$DSTUSR/Library/Tcl"
+			    break
+			fi
 			done
 		    ;;
 		esac

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2008-01-31 12:12:56 UTC (rev 33605)
+++ trunk/base/configure	2008-01-31 12:54:21 UTC (rev 33606)
@@ -11683,6 +11683,8 @@
 
 # Check for Tcl package path
 
+
+
     { echo "$as_me:$LINENO: checking for Tcl package directory" >&5
 echo $ECHO_N "checking for Tcl package directory... $ECHO_C" >&6; }
 
@@ -11711,6 +11713,7 @@
 		    darwin*)
 		    	tcl_autopath=`echo 'puts -nonewline \$auto_path' | $TCLSH`
 			for path in $tcl_autopath; do
+			if test "$DSTUSR" = "root" ; then
 			    if test "$path" = "/Library/Tcl"; then
 				ac_cv_c_tclpkgd="$path"
 				break
@@ -11721,6 +11724,10 @@
 				    break
 			        fi
 			    fi
+			elif test "$path" = "~/Library/Tcl"; then
+			    ac_cv_c_tclpkgd="~$DSTUSR/Library/Tcl"
+			    break
+			fi
 			done
 		    ;;
 		esac

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080131/95866140/attachment.html