[33499] trunk/base

[afb at macports.org]

Revision: 33499
          http://trac.macosforge.org/projects/macports/changeset/33499
Author:   afb at macports.org
Date:     2008-01-28 00:15:07 -0800 (Mon, 28 Jan 2008)

Log Message:
-----------
add placeholder configuration for applications/frameworks installation directory

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

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2008-01-28 04:05:27 UTC (rev 33498)
+++ trunk/base/aclocal.m4	2008-01-28 08:15:07 UTC (rev 33499)
@@ -351,6 +351,48 @@
 	AC_SUBST(DSTMODE)
 ])
 
+# MP_PATH_APPLICATIONS
+#---------------------------------------
+AC_DEFUN([MP_PATH_APPLICATIONS],[
+        AC_REQUIRE([MP_CHECK_INSTALLUSER])
+
+    AC_ARG_WITH(applications-dir,[AC_HELP_STRING([--with-applications-dir], [Applications installation directory.])], MPAPPLICATIONSDIR=${withval})
+
+    AC_MSG_CHECKING([for Applications installation directory])
+
+	if test "x$MPAPPLICATIONSDIR" = "x" ; then
+	    if test "$DSTUSR" = "root" ; then
+		MPAPPLICATIONSDIR="/Applications/MacPorts"
+	    else
+		MPAPPLICATIONSDIR="~$DSTUSR/Applications/MacPorts"
+	    fi
+	fi
+
+	AC_MSG_RESULT([$MPAPPLICATIONSDIR])
+    AC_SUBST(MPAPPLICATIONSDIR)
+])
+
+# MP_PATH_FRAMEWORKS
+#---------------------------------------
+AC_DEFUN([MP_PATH_FRAMEWORKS],[
+        AC_REQUIRE([MP_CHECK_INSTALLUSER])
+
+    AC_ARG_WITH(frameworks-dir,[AC_HELP_STRING([--with-frameworks-dir], [Frameworks installation directory.])], MPFRAMEWORKSDIR=${withval})
+
+    AC_MSG_CHECKING([for Frameworks installation directory])
+
+	if test "x$MPFRAMEWORKSDIR" = "x" ; then
+	    if test "$DSTUSR" = "root" ; then
+		MPFRAMEWORKSDIR="/Library/Frameworks"
+	    else
+		MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
+	    fi
+	fi
+
+	AC_MSG_RESULT([$MPFRAMEWORKSDIR])
+    AC_SUBST(MPFRAMEWORKSDIR)
+])
+
 # MP_LIB_MD5
 #---------------------------------------
 # Check for an md5 implementation

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2008-01-28 04:05:27 UTC (rev 33498)
+++ trunk/base/configure	2008-01-28 08:15:07 UTC (rev 33499)
@@ -728,6 +728,8 @@
 DSTUSR
 DSTGRP
 DSTMODE
+MPAPPLICATIONSDIR
+MPFRAMEWORKSDIR
 CPP
 READLINK_IS_NOT_P1003_1A
 MD5_LIBS
@@ -1396,6 +1398,8 @@
                           Specify group ownership of installed files
   --with-directory-mode=MODE
                           Specify directory mode of installed directories
+  --with-applications-dir Applications installation directory.
+  --with-frameworks-dir   Frameworks installation directory.
   --with-x11-prefix=PREFIX
                           use PREFIX as the X11 base dir (default autodetect)
   --with-x                use the X Window System
@@ -6743,6 +6747,58 @@
 
 
 
+# Check for default directories
+
+
+
+
+# Check whether --with-applications-dir was given.
+if test "${with_applications_dir+set}" = set; then
+  withval=$with_applications_dir; MPAPPLICATIONSDIR=${withval}
+fi
+
+
+    { echo "$as_me:$LINENO: checking for Applications installation directory" >&5
+echo $ECHO_N "checking for Applications installation directory... $ECHO_C" >&6; }
+
+	if test "x$MPAPPLICATIONSDIR" = "x" ; then
+	    if test "$DSTUSR" = "root" ; then
+		MPAPPLICATIONSDIR="/Applications/MacPorts"
+	    else
+		MPAPPLICATIONSDIR="~$DSTUSR/Applications/MacPorts"
+	    fi
+	fi
+
+	{ echo "$as_me:$LINENO: result: $MPAPPLICATIONSDIR" >&5
+echo "${ECHO_T}$MPAPPLICATIONSDIR" >&6; }
+
+
+
+
+
+
+# Check whether --with-frameworks-dir was given.
+if test "${with_frameworks_dir+set}" = set; then
+  withval=$with_frameworks_dir; MPFRAMEWORKSDIR=${withval}
+fi
+
+
+    { echo "$as_me:$LINENO: checking for Frameworks installation directory" >&5
+echo $ECHO_N "checking for Frameworks installation directory... $ECHO_C" >&6; }
+
+	if test "x$MPFRAMEWORKSDIR" = "x" ; then
+	    if test "$DSTUSR" = "root" ; then
+		MPFRAMEWORKSDIR="/Library/Frameworks"
+	    else
+		MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
+	    fi
+	fi
+
+	{ echo "$as_me:$LINENO: result: $MPFRAMEWORKSDIR" >&5
+echo "${ECHO_T}$MPFRAMEWORKSDIR" >&6; }
+
+
+
 # Check for standard header files.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -12964,6 +13020,8 @@
 DSTUSR!$DSTUSR$ac_delim
 DSTGRP!$DSTGRP$ac_delim
 DSTMODE!$DSTMODE$ac_delim
+MPAPPLICATIONSDIR!$MPAPPLICATIONSDIR$ac_delim
+MPFRAMEWORKSDIR!$MPFRAMEWORKSDIR$ac_delim
 CPP!$CPP$ac_delim
 READLINK_IS_NOT_P1003_1A!$READLINK_IS_NOT_P1003_1A$ac_delim
 MD5_LIBS!$MD5_LIBS$ac_delim
@@ -13011,7 +13069,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2008-01-28 04:05:27 UTC (rev 33498)
+++ trunk/base/configure.ac	2008-01-28 08:15:07 UTC (rev 33499)
@@ -138,6 +138,10 @@
 MP_CHECK_INSTALLGROUP
 MP_DIRECTORY_MODE
 
+# Check for default directories
+MP_PATH_APPLICATIONS
+MP_PATH_FRAMEWORKS
+
 # Check for standard header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT

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