Make config file location settable in environment by default.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22599 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-03-05 18:00:44 +00:00
parent df6120a362
commit 36321f0047
4 changed files with 169 additions and 303 deletions

View file

@ -4,6 +4,9 @@
minor bug which would cause runloop to run an extra time on some
occasions.
* Tools/gdomap.c: Include config.h
* configure.ac: Support config file environment variable by default
* configure: Regenerate
* Documentation/Base.gsdoc: Document default setting for env variable
2006-03-04 Richard Frith-Macdonald <rfm@gnu.org>

View file

@ -330,15 +330,16 @@ notice and this notice are preserved.
<term>GNUSTEP_CONFIG_FILE</term>
<desc>
<p>
This has no effect unless the base library has been
configured/built with the
<code>--enable-environment-config-file</code> option.<br />
This functionality may have been disabled if the base library
was configured/built with the
<code>--disable-environment-config-file</code> option.<br />
If it is operational, the environment variable overrides the
normal path to the gnustep config file used to determine the
locations of paths for the gnustep system (see later).<br />
This is provided to support the odd situation where you may
want to simultaneously run applications using different sets
of resources but linked to a lingle copy of the base library.
of resources but linked to a single copy of the base library,
or you want to use an alternative config file for some reason.
</p>
</desc>
<term>HOMEDRIVE</term>
@ -602,8 +603,8 @@ notice and this notice are preserved.
<p>
Secondly, If the value of the path built in to the base library
as the location of the config file (or specified by
the GNUSTEP_CONFIG_FILE environment variable if that option
was enabled when the base library was configured)
the GNUSTEP_CONFIG_FILE environment variable unless that option
was disabled when the base library was configured)
begins with a dot and slash (./) then the path used for that
file is made relative to the base library.<br />
ie the text after the dot-slash is appended to the path of the

438
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -91,20 +91,18 @@ AC_SUBST(GNUSTEP_CONFIG_FILE)
#-----------------------------------------------------------------
AC_MSG_CHECKING([whether the GNUstep.conf file path can be set in the environment])
AC_ARG_ENABLE(environment-config-file,
[ --enable-environment-config-file
Enable use of the GNUSTEP_CONFIG_FILE
[ --disable-environment-config-file
Disable use of the GNUSTEP_CONFIG_FILE
environment variable to specify/override
the location of the GNUstep config file
at runtime. This option is occasionally
useful for development/debugging or for
providing a relocatable distribution package
for platforms where the path to the base
library can't be determined at runtime
and the leading './' in the config file name
is therefore not supported.
Normally this should be left disabled.],
useful to disable the environment variable
for sites which wish to 'lock down' users
to always work with a specific system-wide
configuration.
Normally this should be left enabled.],
ac_cv_environment_config_file=$enableval,
ac_cv_environment_config_file="no")
ac_cv_environment_config_file="yes")
if test "$ac_cv_environment_config_file" = "yes"; then
AC_DEFINE(OPTION_NO_ENVIRONMENT, 0,
[Enable GNUSTEP_CONFIG_FILE environment variable])