gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clearly warn people that the --with-user-dir option is obsolete and has no effect

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@25938 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2008-01-14 10:02:47 +00:00
parent b4d1bdd037
commit f307e97f63
3 changed files with 42 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-01-14 Nicola Pero <nicola.pero@meta-innovation.com>
* configure.ac: Clearly explain in the help that --with-user-dir
is an obsolete option in gnustep-make v2. Print a warning if it
used, and otherwise ignore it.
* configure: Regenerated.
2008-01-14 Nicola Pero <nicola.pero@meta-innovation.com>
* GNUstep.sh.in: Unset GNUSTEP_SYSTEM_USERS_DIR,

50
configure vendored
View file

@ -650,7 +650,6 @@ TAR
CHOWN
GNUSTEP_CONFIG_FILE
GNUSTEP_USER_CONFIG_FILE
GNUSTEP_USER_DIR
GNUSTEP_USER_DEFAULTS_DIR
GNUSTEP_MAKEFILES
HOST_INSTALL
@ -706,6 +705,7 @@ GNUSTEP_LOCAL_USERS_DIR
GNUSTEP_SYSTEM_ROOT
GNUSTEP_NETWORK_ROOT
GNUSTEP_LOCAL_ROOT
GNUSTEP_USER_DIR
GNUSTEP_MULTI_PLATFORM
BACKEND_BUNDLE
objc_threaded
@ -1455,13 +1455,13 @@ Optional Packages:
--with-user-dir
Set the GNUSTEP_USER_DIR directory for all users. This can be
relative to the user's home directory if it is a relative path,
or an absolute directory (the same for all users) if it is an
absolute path. Use this option if you want to have the
GNUSTEP_USER_DIR directory in a non default place for all users.
The default is 'GNUstep'.
Example: --with-user-dir='gnustep'
This is an obsolete option. It used to determine the location of
the USER domain directory (inside of each user's home directory)
under the 'gnustep' layout. We ignore this option so that you can
write ./configure commands that work with both old and new
gnustep-makes. To get the effect of this option with this version
of gnustep-make, please create your own layout file and use
--with-layout=xxx to use it.
--with-user-defaults-dir
@ -4185,31 +4185,23 @@ echo "${ECHO_T}$GNUSTEP_USER_CONFIG_FILE" >&6; }
#--------------------------------------------------------------------
# Process --with-user-dir
#--------------------------------------------------------------------
{ echo "$as_me:$LINENO: checking for user dir to use" >&5
echo $ECHO_N "checking for user dir to use... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: checking if the obsolete --with-user-dir option was used" >&5
echo $ECHO_N "checking if the obsolete --with-user-dir option was used... $ECHO_C" >&6; }
# Check whether --with-user-dir was given.
if test "${with_user_dir+set}" = set; then
withval=$with_user_dir; GNUSTEP_USER_DIR="$withval"
withval=$with_user_dir; OBSOLETE_GNUSTEP_USER_DIR="$withval"
fi
# Keep in mind we already have a default value set by the filesystem
# layout, so it should never be empty.
if echo "$GNUSTEP_USER_DIR" | grep '[ \\] > /dev/null'
then
echo "found a backslash or space (illegal) in '$GNUSTEP_USER_DIR'"
echo "Please try again using --with-user-dir= to specify a value."
if test "$MSWIND" = "yes"
then
echo "Please note that on windows you must use unix-style paths within"
echo "the make package even though gnustep programs built in the mingw32"
echo "environment use native paths throughout."
fi
exit 1
if test ! x"$OBSOLETE_GNUSTEP_USER_DIR" = x"" && test ! x"$OBSOLETE_GNUSTEP_USER_DIR" = x"no"; then
{ echo "$as_me:$LINENO: result: $OBSOLETE_GNUSTEP_USER_DIR: ignored" >&5
echo "${ECHO_T}$OBSOLETE_GNUSTEP_USER_DIR: ignored" >&6; }
{ echo "$as_me:$LINENO: WARNING: ignoring --with-user-dir=$OBSOLETE_GNUSTEP_USER_DIR option" >&5
echo "$as_me: WARNING: ignoring --with-user-dir=$OBSOLETE_GNUSTEP_USER_DIR option" >&2;}
else
{ echo "$as_me:$LINENO: result: no: good" >&5
echo "${ECHO_T}no: good" >&6; }
fi
{ echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR" >&5
echo "${ECHO_T}$GNUSTEP_USER_DIR" >&6; }
#--------------------------------------------------------------------
# Process --with-user-defaults-dir
@ -6430,7 +6422,6 @@ TAR!$TAR$ac_delim
CHOWN!$CHOWN$ac_delim
GNUSTEP_CONFIG_FILE!$GNUSTEP_CONFIG_FILE$ac_delim
GNUSTEP_USER_CONFIG_FILE!$GNUSTEP_USER_CONFIG_FILE$ac_delim
GNUSTEP_USER_DIR!$GNUSTEP_USER_DIR$ac_delim
GNUSTEP_USER_DEFAULTS_DIR!$GNUSTEP_USER_DEFAULTS_DIR$ac_delim
GNUSTEP_MAKEFILES!$GNUSTEP_MAKEFILES$ac_delim
HOST_INSTALL!$HOST_INSTALL$ac_delim
@ -6455,6 +6446,7 @@ GNUSTEP_NETWORK_ADMIN_TOOLS!$GNUSTEP_NETWORK_ADMIN_TOOLS$ac_delim
GNUSTEP_NETWORK_LIBRARY!$GNUSTEP_NETWORK_LIBRARY$ac_delim
GNUSTEP_NETWORK_HEADERS!$GNUSTEP_NETWORK_HEADERS$ac_delim
GNUSTEP_NETWORK_LIBRARIES!$GNUSTEP_NETWORK_LIBRARIES$ac_delim
GNUSTEP_NETWORK_DOC!$GNUSTEP_NETWORK_DOC$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -6496,7 +6488,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
GNUSTEP_NETWORK_DOC!$GNUSTEP_NETWORK_DOC$ac_delim
GNUSTEP_NETWORK_DOC_INFO!$GNUSTEP_NETWORK_DOC_INFO$ac_delim
GNUSTEP_NETWORK_DOC_MAN!$GNUSTEP_NETWORK_DOC_MAN$ac_delim
GNUSTEP_LOCAL_APPS!$GNUSTEP_LOCAL_APPS$ac_delim
@ -6527,6 +6518,7 @@ GNUSTEP_LOCAL_USERS_DIR!$GNUSTEP_LOCAL_USERS_DIR$ac_delim
GNUSTEP_SYSTEM_ROOT!$GNUSTEP_SYSTEM_ROOT$ac_delim
GNUSTEP_NETWORK_ROOT!$GNUSTEP_NETWORK_ROOT$ac_delim
GNUSTEP_LOCAL_ROOT!$GNUSTEP_LOCAL_ROOT$ac_delim
GNUSTEP_USER_DIR!$GNUSTEP_USER_DIR$ac_delim
GNUSTEP_MULTI_PLATFORM!$GNUSTEP_MULTI_PLATFORM$ac_delim
BACKEND_BUNDLE!$BACKEND_BUNDLE$ac_delim
objc_threaded!$objc_threaded$ac_delim

38
configure.ac
View file

@ -516,34 +516,24 @@ AC_SUBST(GNUSTEP_USER_CONFIG_FILE)
#--------------------------------------------------------------------
# Process --with-user-dir
#--------------------------------------------------------------------
AC_MSG_CHECKING(for user dir to use)
AC_MSG_CHECKING(if the obsolete --with-user-dir option was used)
AC_ARG_WITH(user-dir,[
--with-user-dir
Set the GNUSTEP_USER_DIR directory for all users. This can be
relative to the user's home directory if it is a relative path,
or an absolute directory (the same for all users) if it is an
absolute path. Use this option if you want to have the
GNUSTEP_USER_DIR directory in a non default place for all users.
The default is 'GNUstep'.
Example: --with-user-dir='gnustep'
This is an obsolete option. It used to determine the location of
the USER domain directory (inside of each user's home directory)
under the 'gnustep' layout. We ignore this option so that you can
write ./configure commands that work with both old and new
gnustep-makes. To get the effect of this option with this version
of gnustep-make, please create your own layout file and use
--with-layout=xxx to use it.
],
GNUSTEP_USER_DIR="$withval",)
# Keep in mind we already have a default value set by the filesystem
# layout, so it should never be empty.
if echo "$GNUSTEP_USER_DIR" | grep '[[ \\]] > /dev/null'
then
echo "found a backslash or space (illegal) in '$GNUSTEP_USER_DIR'"
echo "Please try again using --with-user-dir= to specify a value."
if test "$MSWIND" = "yes"
then
echo "Please note that on windows you must use unix-style paths within"
echo "the make package even though gnustep programs built in the mingw32"
echo "environment use native paths throughout."
fi
exit 1
OBSOLETE_GNUSTEP_USER_DIR="$withval",)
if test ! x"$OBSOLETE_GNUSTEP_USER_DIR" = x"" && test ! x"$OBSOLETE_GNUSTEP_USER_DIR" = x"no"; then
AC_MSG_RESULT([$OBSOLETE_GNUSTEP_USER_DIR: ignored])
AC_MSG_WARN([ignoring --with-user-dir=$OBSOLETE_GNUSTEP_USER_DIR option])
else
AC_MSG_RESULT(no: good)
fi
AC_MSG_RESULT($GNUSTEP_USER_DIR)
AC_SUBST(GNUSTEP_USER_DIR)
#--------------------------------------------------------------------
# Process --with-user-defaults-dir