gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved --with-installation-domain=xxx configure option, and fixed support for installation-domains.conf file

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27414 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2008-12-24 18:11:38 +00:00
parent 10f5aab56a
commit 823e5f0032
5 changed files with 102 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

45
configure.ac
View file

@ -353,16 +353,37 @@ if test x"$GNUSTEP_USER_DIR_DOC_INFO" = x""; then GNUSTEP_USER_DIR_DOC_INFO=$GNU
AC_MSG_CHECKING([for GNUstep-base installation domain])
AC_ARG_WITH(installation-domain,
[ --with-installation-domain=DOMAIN
Specify the domain (SYSTEM, LOCAL, NETWORK
or USER) into which gnustep-base will be installed. This is
necessary whenever because relative paths
are hardcoded into gnustep-base. If this is not specified, LOCAL
is used. Please make sure this matches the DOMAIN where
you will be installing gnustep-base to prevent problems
with finding resources at runtime.],
Specify the domain (SYSTEM, LOCAL,
NETWORK or USER) into which
gnustep-base will be installed.
Whenever relative paths are hardcoded
into gnustep-base (at the moment, this
happens only on MinGW) this option
must be used and must match the domain
where you will be installing
gnustep-base.
If this is not specified, the output of
gnustep-config --installation-domain-for=gnustep-base
(which should normally be LOCAL) is used.],
result="$withval",
result="$GNUSTEP_INSTALLATION_DOMAIN"
result="no"
)
if test "$result" == "no"
then
# Check if gnustep-config supports the option
# --installation-domain-for, and use it if available. That option
# will automatically use the shell variable GNUSTEP_INSTALLATION_DOMAIN
# or the installation-domains.conf files (or the LOCAL default) as appropriate.
# Otherwise, if that option is not available just fall back to LOCAL.
if (gnustep-config --help | grep installation-domain) >&5 2>&5
then
result=`gnustep-config --installation-domain-for=gnustep-base 2>&5`
else
# This case was added on December 2008 and is only for backwards
# compatibility with older versions of gnustep-make.
result=LOCAL
fi
fi
case "$result" in
SYSTEM)
AC_MSG_RESULT([SYSTEM])
@ -377,10 +398,12 @@ case "$result" in
AC_MSG_RESULT([USER])
GNUSTEP_BASE_PATH="$GNUSTEP_USER_TOOLS";;
*)
AC_MSG_RESULT([none specified => using LOCAL])
result=LOCAL;
GNUSTEP_BASE_PATH="$GNUSTEP_LOCAL_TOOLS";;
AC_MSG_ERROR([Unknown installation domain '$result' (it should be SYSTEM, LOCAL, NETWORK or USER). Please run configure again with the option --with-installation-domain=LOCAL (or whatever domain you want to install into).])
exit 1;;
esac
# We store GNUSTEP_BASE_DOMAIN in config.mak so that we can check
# at runtime and make sure it is consistent with the
# GNUSTEP_INSTALLATION_DOMAIN that is used at runtime.
GNUSTEP_BASE_DOMAIN=$result
AC_SUBST(GNUSTEP_BASE_DOMAIN)