mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Added --with-system-root=xxx option
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21811 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
1ec2cfa824
commit
ed01dd45c1
3 changed files with 57 additions and 18 deletions
|
|
@ -1,6 +1,11 @@
|
|||
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* configure.ac: Added --with-system-root=xxx option.
|
||||
* configure: Regenerated.
|
||||
|
||||
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
Removed obsolete variable GNUSTEP_ROOT.
|
||||
Removed obsolete public variable GNUSTEP_ROOT.
|
||||
* configure.ac: Do not replace GNUSTEP_ROOT in generate files.
|
||||
* configure: Regenerated.
|
||||
* GNUstep.csh.in: Do not define GNUSTEP_ROOT.
|
||||
|
|
|
|||
37
configure
vendored
37
configure
vendored
|
|
@ -870,6 +870,11 @@ Optional Packages:
|
|||
--with-library-combo Define the default library combination
|
||||
|
||||
--with-tar Set the name of the tar program to use
|
||||
--with-system-root
|
||||
Set the GNUSTEP_SYSTEM_ROOT directory. Use this option if you want
|
||||
to have the GNUSTEP_SYSTEM_ROOT directory in a non-standard place. Example:
|
||||
--with-system-root=/usr/GNUstep/System
|
||||
|
||||
--with-local-root
|
||||
Set the GNUSTEP_LOCAL_ROOT directory. Use this option if you want
|
||||
to have the GNUSTEP_LOCAL_ROOT directory in a non-standard place. Example:
|
||||
|
|
@ -3228,14 +3233,16 @@ fi
|
|||
# defined, but if not then we have a global default.
|
||||
# Also test for the C: directory, which means we're on Windows
|
||||
#--------------------------------------------------------------------
|
||||
echo "$as_me:$LINENO: checking for GNUSTEP_SYSTEM_ROOT to use" >&5
|
||||
echo $ECHO_N "checking for GNUSTEP_SYSTEM_ROOT to use... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking for root of GNUstep installation to use (if any)" >&5
|
||||
echo $ECHO_N "checking for root of GNUstep installation to use (if any)... $ECHO_C" >&6
|
||||
|
||||
if test "x$prefix" = "xNONE"; then
|
||||
prefix="$ac_default_prefix" ;
|
||||
fi
|
||||
#
|
||||
# GNUSTEP_ROOT is only used to build GNUSTEP_LOCAL_ROOT if not specified
|
||||
# GNUSTEP_ROOT is only used to build GNUSTEP_SYSTEM_ROOT /
|
||||
# GNUSTEP_LOCAL_ROOT if no --with-system-root= / --with-local-root=
|
||||
# option is used.
|
||||
#
|
||||
GNUSTEP_ROOT="$prefix"
|
||||
if test "x`basename $prefix`" = xSystem; then
|
||||
|
|
@ -3247,17 +3254,29 @@ else
|
|||
prefix="$prefix/System"
|
||||
fi
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_ROOT" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_ROOT" >&6
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-system-root (TODO)
|
||||
# Process --with-system-root
|
||||
#--------------------------------------------------------------------
|
||||
GNUSTEP_SYSTEM_ROOT=$prefix
|
||||
echo "$as_me:$LINENO: checking for GNUSTEP_SYSTEM_ROOT to use" >&5
|
||||
echo $ECHO_N "checking for GNUSTEP_SYSTEM_ROOT to use... $ECHO_C" >&6
|
||||
|
||||
# Check whether --with-system-root or --without-system-root was given.
|
||||
if test "${with_system_root+set}" = set; then
|
||||
withval="$with_system_root"
|
||||
GNUSTEP_SYSTEM_ROOT="$withval"
|
||||
else
|
||||
GNUSTEP_SYSTEM_ROOT="$GNUSTEP_ROOT/System"
|
||||
|
||||
fi;
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_ROOT" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_SYSTEM_ROOT" >&6
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-local-root and --with-network-root
|
||||
# Process --with-local-root
|
||||
#--------------------------------------------------------------------
|
||||
echo "$as_me:$LINENO: checking for GNUSTEP_LOCAL_ROOT to use" >&5
|
||||
echo $ECHO_N "checking for GNUSTEP_LOCAL_ROOT to use... $ECHO_C" >&6
|
||||
|
|
@ -3273,6 +3292,10 @@ fi;
|
|||
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_ROOT" >&5
|
||||
echo "${ECHO_T}$GNUSTEP_LOCAL_ROOT" >&6
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-network-root
|
||||
#--------------------------------------------------------------------
|
||||
echo "$as_me:$LINENO: checking for GNUSTEP_NETWORK_ROOT to use" >&5
|
||||
echo $ECHO_N "checking for GNUSTEP_NETWORK_ROOT to use... $ECHO_C" >&6
|
||||
|
||||
|
|
@ -3295,8 +3318,6 @@ echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_ROOT" >&5
|
|||
echo "${ECHO_T}$GNUSTEP_NETWORK_ROOT" >&6
|
||||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-defaults-root and --with-user-root
|
||||
#--------------------------------------------------------------------
|
||||
|
|
|
|||
31
configure.ac
31
configure.ac
|
|
@ -184,7 +184,7 @@ fi
|
|||
# defined, but if not then we have a global default.
|
||||
# Also test for the C: directory, which means we're on Windows
|
||||
#--------------------------------------------------------------------
|
||||
AC_MSG_CHECKING(for GNUSTEP_SYSTEM_ROOT to use)
|
||||
AC_MSG_CHECKING(for root of GNUstep installation to use (if any))
|
||||
AC_PREFIX_DEFAULT(`if test "x$GNUSTEP_SYSTEM_ROOT" = "x"; then
|
||||
if test -d C: ; then
|
||||
echo C:/GNUstep;
|
||||
|
|
@ -198,8 +198,9 @@ if test "x$prefix" = "xNONE"; then
|
|||
prefix="$ac_default_prefix" ;
|
||||
fi
|
||||
#
|
||||
# GNUSTEP_ROOT is only used to build GNUSTEP_LOCAL_ROOT if no
|
||||
# --with-local-root= option is used.
|
||||
# GNUSTEP_ROOT is only used to build GNUSTEP_SYSTEM_ROOT /
|
||||
# GNUSTEP_LOCAL_ROOT if no --with-system-root= / --with-local-root=
|
||||
# option is used.
|
||||
#
|
||||
GNUSTEP_ROOT="$prefix"
|
||||
if test "x`basename $prefix`" = xSystem; then
|
||||
|
|
@ -211,16 +212,26 @@ else
|
|||
prefix="$prefix/System"
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT($GNUSTEP_ROOT)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-system-root (TODO)
|
||||
# Process --with-system-root
|
||||
#--------------------------------------------------------------------
|
||||
GNUSTEP_SYSTEM_ROOT=$prefix
|
||||
AC_SUBST(GNUSTEP_SYSTEM_ROOT)
|
||||
AC_MSG_CHECKING(for GNUSTEP_SYSTEM_ROOT to use)
|
||||
AC_ARG_WITH(system-root,
|
||||
[--with-system-root
|
||||
Set the GNUSTEP_SYSTEM_ROOT directory. Use this option if you want
|
||||
to have the GNUSTEP_SYSTEM_ROOT directory in a non-standard place. Example:
|
||||
--with-system-root=/usr/GNUstep/System
|
||||
],
|
||||
GNUSTEP_SYSTEM_ROOT="$withval",
|
||||
GNUSTEP_SYSTEM_ROOT="$GNUSTEP_ROOT/System"
|
||||
)
|
||||
AC_MSG_RESULT($GNUSTEP_SYSTEM_ROOT)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_ROOT)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-local-root and --with-network-root
|
||||
# Process --with-local-root
|
||||
#--------------------------------------------------------------------
|
||||
AC_MSG_CHECKING(for GNUSTEP_LOCAL_ROOT to use)
|
||||
AC_ARG_WITH(local-root,
|
||||
|
|
@ -233,7 +244,11 @@ GNUSTEP_LOCAL_ROOT="$withval",
|
|||
GNUSTEP_LOCAL_ROOT="$GNUSTEP_ROOT/Local"
|
||||
)
|
||||
AC_MSG_RESULT($GNUSTEP_LOCAL_ROOT)
|
||||
AC_SUBST(GNUSTEP_LOCAL_ROOT)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Process --with-network-root
|
||||
#--------------------------------------------------------------------
|
||||
AC_MSG_CHECKING(for GNUSTEP_NETWORK_ROOT to use)
|
||||
AC_ARG_WITH(network-root,
|
||||
[--with-network-root
|
||||
|
|
@ -252,8 +267,6 @@ GNUSTEP_NETWORK_ROOT="$withval",
|
|||
GNUSTEP_NETWORK_ROOT="$GNUSTEP_LOCAL_ROOT"
|
||||
)
|
||||
AC_MSG_RESULT($GNUSTEP_NETWORK_ROOT)
|
||||
|
||||
AC_SUBST(GNUSTEP_LOCAL_ROOT)
|
||||
AC_SUBST(GNUSTEP_NETWORK_ROOT)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue