Changeset 33499


Ignore:
Timestamp:
Jan 28, 2008, 8:15:07 AM (13 years ago)
Author:
afb@…
Message:

add placeholder configuration for applications/frameworks installation directory

Location:
trunk/base
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/aclocal.m4

    r32543 r33499  
    350350        AC_MSG_RESULT([$DSTMODE])
    351351        AC_SUBST(DSTMODE)
     352])
     353
     354# MP_PATH_APPLICATIONS
     355#---------------------------------------
     356AC_DEFUN([MP_PATH_APPLICATIONS],[
     357        AC_REQUIRE([MP_CHECK_INSTALLUSER])
     358
     359    AC_ARG_WITH(applications-dir,[AC_HELP_STRING([--with-applications-dir], [Applications installation directory.])], MPAPPLICATIONSDIR=${withval})
     360
     361    AC_MSG_CHECKING([for Applications installation directory])
     362
     363        if test "x$MPAPPLICATIONSDIR" = "x" ; then
     364            if test "$DSTUSR" = "root" ; then
     365                MPAPPLICATIONSDIR="/Applications/MacPorts"
     366            else
     367                MPAPPLICATIONSDIR="~$DSTUSR/Applications/MacPorts"
     368            fi
     369        fi
     370
     371        AC_MSG_RESULT([$MPAPPLICATIONSDIR])
     372    AC_SUBST(MPAPPLICATIONSDIR)
     373])
     374
     375# MP_PATH_FRAMEWORKS
     376#---------------------------------------
     377AC_DEFUN([MP_PATH_FRAMEWORKS],[
     378        AC_REQUIRE([MP_CHECK_INSTALLUSER])
     379
     380    AC_ARG_WITH(frameworks-dir,[AC_HELP_STRING([--with-frameworks-dir], [Frameworks installation directory.])], MPFRAMEWORKSDIR=${withval})
     381
     382    AC_MSG_CHECKING([for Frameworks installation directory])
     383
     384        if test "x$MPFRAMEWORKSDIR" = "x" ; then
     385            if test "$DSTUSR" = "root" ; then
     386                MPFRAMEWORKSDIR="/Library/Frameworks"
     387            else
     388                MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
     389            fi
     390        fi
     391
     392        AC_MSG_RESULT([$MPFRAMEWORKSDIR])
     393    AC_SUBST(MPFRAMEWORKSDIR)
    352394])
    353395
  • trunk/base/configure

    r33108 r33499  
    729729DSTGRP
    730730DSTMODE
     731MPAPPLICATIONSDIR
     732MPFRAMEWORKSDIR
    731733CPP
    732734READLINK_IS_NOT_P1003_1A
     
    13971399  --with-directory-mode=MODE
    13981400                          Specify directory mode of installed directories
     1401  --with-applications-dir Applications installation directory.
     1402  --with-frameworks-dir   Frameworks installation directory.
    13991403  --with-x11-prefix=PREFIX
    14001404                          use PREFIX as the X11 base dir (default autodetect)
     
    67416745        { echo "$as_me:$LINENO: result: $DSTMODE" >&5
    67426746echo "${ECHO_T}$DSTMODE" >&6; }
     6747
     6748
     6749
     6750# Check for default directories
     6751
     6752
     6753
     6754
     6755# Check whether --with-applications-dir was given.
     6756if test "${with_applications_dir+set}" = set; then
     6757  withval=$with_applications_dir; MPAPPLICATIONSDIR=${withval}
     6758fi
     6759
     6760
     6761    { echo "$as_me:$LINENO: checking for Applications installation directory" >&5
     6762echo $ECHO_N "checking for Applications installation directory... $ECHO_C" >&6; }
     6763
     6764        if test "x$MPAPPLICATIONSDIR" = "x" ; then
     6765            if test "$DSTUSR" = "root" ; then
     6766                MPAPPLICATIONSDIR="/Applications/MacPorts"
     6767            else
     6768                MPAPPLICATIONSDIR="~$DSTUSR/Applications/MacPorts"
     6769            fi
     6770        fi
     6771
     6772        { echo "$as_me:$LINENO: result: $MPAPPLICATIONSDIR" >&5
     6773echo "${ECHO_T}$MPAPPLICATIONSDIR" >&6; }
     6774
     6775
     6776
     6777
     6778
     6779
     6780# Check whether --with-frameworks-dir was given.
     6781if test "${with_frameworks_dir+set}" = set; then
     6782  withval=$with_frameworks_dir; MPFRAMEWORKSDIR=${withval}
     6783fi
     6784
     6785
     6786    { echo "$as_me:$LINENO: checking for Frameworks installation directory" >&5
     6787echo $ECHO_N "checking for Frameworks installation directory... $ECHO_C" >&6; }
     6788
     6789        if test "x$MPFRAMEWORKSDIR" = "x" ; then
     6790            if test "$DSTUSR" = "root" ; then
     6791                MPFRAMEWORKSDIR="/Library/Frameworks"
     6792            else
     6793                MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
     6794            fi
     6795        fi
     6796
     6797        { echo "$as_me:$LINENO: result: $MPFRAMEWORKSDIR" >&5
     6798echo "${ECHO_T}$MPFRAMEWORKSDIR" >&6; }
    67436799
    67446800
     
    1296513021DSTGRP!$DSTGRP$ac_delim
    1296613022DSTMODE!$DSTMODE$ac_delim
     13023MPAPPLICATIONSDIR!$MPAPPLICATIONSDIR$ac_delim
     13024MPFRAMEWORKSDIR!$MPFRAMEWORKSDIR$ac_delim
    1296713025CPP!$CPP$ac_delim
    1296813026READLINK_IS_NOT_P1003_1A!$READLINK_IS_NOT_P1003_1A$ac_delim
     
    1301213070_ACEOF
    1301313071
    13014   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
     13072  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
    1301513073    break
    1301613074  elif $ac_last_try; then
  • trunk/base/configure.ac

    r33108 r33499  
    139139MP_DIRECTORY_MODE
    140140
     141# Check for default directories
     142MP_PATH_APPLICATIONS
     143MP_PATH_FRAMEWORKS
     144
    141145# Check for standard header files.
    142146AC_HEADER_STDC
Note: See TracChangeset for help on using the changeset viewer.