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

Make more robust when people use strange options.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@22846 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-05-01 12:13:18 +00:00
parent 854ddeba5f
commit 8b02e7b6c7
3 changed files with 76 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-05-01 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Change --with... options specifying paths so that if
someone oddly uses --without... we treat it as if they had specified
nothing.
2006-04-26 Adam Fedor <fedor@gnu.org>
* Documentation/gnustep-howto.texi: Fix node link

116
configure vendored
View file

@ -1098,7 +1098,7 @@ esac
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
cd $ac_popdir
cd "$ac_popdir"
done
fi
@ -2022,8 +2022,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2081,8 +2080,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2198,8 +2196,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2253,8 +2250,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2299,8 +2295,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -2344,8 +2339,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3324,16 +3318,15 @@ echo $ECHO_N "checking for GNUstep configuration file to use... $ECHO_C" >&6
if test "${with_config_file+set}" = set; then
withval="$with_config_file"
GNUSTEP_CONFIG_FILE="$withval"
else
if test "$GNUSTEP_CONFIG_FILE" = ""; then
case "$target_os" in
freebsd* | openbsd* ) GNUSTEP_CONFIG_FILE=/usr/etc/GNUstep.conf ;;
netbsd* ) GNUSTEP_CONFIG_FILE=/usr/pkg/etc/GNUstep.conf ;;
mingw32* ) GNUSTEP_CONFIG_FILE=/c/GNUstep/GNUstep.conf-dev ;;
*) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;;
esac
fi
fi;
if test "$GNUSTEP_CONFIG_FILE" = "" -o "$GNUSTEP_CONFIG_FILE" = "no"; then
case "$target_os" in
freebsd* | openbsd* ) GNUSTEP_CONFIG_FILE=/usr/etc/GNUstep.conf ;;
netbsd* ) GNUSTEP_CONFIG_FILE=/usr/pkg/etc/GNUstep.conf ;;
mingw32* ) GNUSTEP_CONFIG_FILE=/c/GNUstep/GNUstep.conf-dev ;;
*) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;;
esac
fi
echo "$as_me:$LINENO: result: $GNUSTEP_CONFIG_FILE" >&5
echo "${ECHO_T}$GNUSTEP_CONFIG_FILE" >&6
@ -3455,12 +3448,10 @@ echo $ECHO_N "checking for GNUSTEP_SYSTEM_ROOT to use... $ECHO_C" >&6
if test "${with_system_root+set}" = set; then
withval="$with_system_root"
GNUSTEP_SYSTEM_ROOT="$withval"
else
if test "$GNUSTEP_SYSTEM_ROOT" = ""; then
fi;
if test "$GNUSTEP_SYSTEM_ROOT" = "" -o "$GNUSTEP_SYSTEM_ROOT" = "no"; then
GNUSTEP_SYSTEM_ROOT="$GNUSTEP_ROOT/System"
fi
fi;
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_ROOT" >&5
echo "${ECHO_T}$GNUSTEP_SYSTEM_ROOT" >&6
@ -3475,12 +3466,10 @@ echo $ECHO_N "checking for GNUSTEP_LOCAL_ROOT to use... $ECHO_C" >&6
if test "${with_local_root+set}" = set; then
withval="$with_local_root"
GNUSTEP_LOCAL_ROOT="$withval"
else
if test "$GNUSTEP_LOCAL_ROOT" = ""; then
fi;
if test "$GNUSTEP_LOCAL_ROOT" = "" -o "$GNUSTEP_LOCAL_ROOT" = "no"; then
GNUSTEP_LOCAL_ROOT="$GNUSTEP_ROOT/Local"
fi
fi;
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_ROOT" >&5
echo "${ECHO_T}$GNUSTEP_LOCAL_ROOT" >&6
@ -3495,19 +3484,17 @@ echo $ECHO_N "checking for GNUSTEP_NETWORK_ROOT to use... $ECHO_C" >&6
if test "${with_network_root+set}" = set; then
withval="$with_network_root"
GNUSTEP_NETWORK_ROOT="$withval"
else
# By default we disable network root, by setting GNUSTEP_NETWORK_ROOT
fi;
# By default we disable network root, by setting GNUSTEP_NETWORK_ROOT
# to be the same as GNUSTEP_LOCAL_ROOT. GNUSTEP_NETWORK_ROOT is very
# rarely used, and most users prefer simpler systems with shorter
# paths and shorter command lines. To turn on GNUSTEP_NETWORK_ROOT
# again, you can use the --with-network-root=xxx option; pass
# something like --with-network-root=/usr/GNUstep/Network on the
# configure command line.
if test "$GNUSTEP_NETWORK_ROOT" = ""; then
if test "$GNUSTEP_NETWORK_ROOT" = "" -o "$GNUSTEP_NETWORK_ROOT" = "no"; then
GNUSTEP_NETWORK_ROOT="$GNUSTEP_LOCAL_ROOT"
fi
fi;
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_ROOT" >&5
echo "${ECHO_T}$GNUSTEP_NETWORK_ROOT" >&6
@ -3522,12 +3509,10 @@ echo $ECHO_N "checking for user config file to use... $ECHO_C" >&6
if test "${with_user_config_file+set}" = set; then
withval="$with_user_config_file"
GNUSTEP_USER_CONFIG_FILE="$withval"
else
if test "$GNUSTEP_USER_CONFIG_FILE" = ""; then
fi;
if test "$GNUSTEP_USER_CONFIG_FILE" = "" -o "$GNUSTEP_USER_CONFIG_FILE" = "no"; then
GNUSTEP_USER_CONFIG_FILE=".GNUstep.conf"
fi
fi;
echo "$as_me:$LINENO: result: $GNUSTEP_USER_CONFIG_FILE" >&5
echo "${ECHO_T}$GNUSTEP_USER_CONFIG_FILE" >&6
@ -3542,12 +3527,10 @@ echo $ECHO_N "checking for user dir to use... $ECHO_C" >&6
if test "${with_user_dir+set}" = set; then
withval="$with_user_dir"
GNUSTEP_USER_DIR="$withval"
else
if test "$GNUSTEP_USER_DIR" = ""; then
fi;
if test "$GNUSTEP_USER_DIR" = "" -o "$GNUSTEP_USER_DIR" = "no"; then
GNUSTEP_USER_DIR="GNUstep"
fi
fi;
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR" >&5
echo "${ECHO_T}$GNUSTEP_USER_DIR" >&6
@ -3562,12 +3545,10 @@ echo $ECHO_N "checking for user defaults dir to use... $ECHO_C" >&6
if test "${with_user_defaults_dir+set}" = set; then
withval="$with_user_defaults_dir"
GNUSTEP_USER_DEFAULTS_DIR="$withval"
else
if test "$GNUSTEP_USER_DEFAULTS_DIR" = ""; then
fi;
if test "$GNUSTEP_USER_DEFAULTS_DIR" = "" -o "$GNUSTEP_USER_DEFAULTS_DIR" = "no"; then
GNUSTEP_USER_DEFAULTS_DIR="GNUstep/Defaults"
fi
fi;
echo "$as_me:$LINENO: result: $GNUSTEP_USER_DEFAULTS_DIR" >&5
echo "${ECHO_T}$GNUSTEP_USER_DEFAULTS_DIR" >&6
@ -3789,8 +3770,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3862,8 +3842,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3917,8 +3896,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -3989,8 +3967,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4044,8 +4021,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4128,8 +4104,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4299,8 +4274,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4379,8 +4353,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4568,8 +4541,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@ -4615,6 +4587,9 @@ else
OBJC_THREAD=
fi;
if test "$OBJC_THREAD" = no; then
OBJC_THREAD=
fi
echo "$as_me:$LINENO: checking whether objc has thread support" >&5
@ -6122,11 +6097,6 @@ esac
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
if test x"$ac_file" != x-; then
{ echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@ -6165,6 +6135,12 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
fi;;
esac
done` || { (exit 1); exit 1; }
if test x"$ac_file" != x-; then
{ echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub

51
configure.ac
View file

@ -192,15 +192,15 @@ AC_ARG_WITH(config-file,[
if you want to have the GNUstep config file in a non-standard place.
Example: --with-config-file=/usr/GNUstep/GNUstep.conf
],
GNUSTEP_CONFIG_FILE="$withval",
[if test "$GNUSTEP_CONFIG_FILE" = ""; then
case "$target_os" in
freebsd* | openbsd* ) GNUSTEP_CONFIG_FILE=/usr/etc/GNUstep.conf ;;
netbsd* ) GNUSTEP_CONFIG_FILE=/usr/pkg/etc/GNUstep.conf ;;
mingw32* ) GNUSTEP_CONFIG_FILE=/c/GNUstep/GNUstep.conf-dev ;;
*) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;;
esac
fi])
GNUSTEP_CONFIG_FILE="$withval",)
if test "$GNUSTEP_CONFIG_FILE" = "" -o "$GNUSTEP_CONFIG_FILE" = "no"; then
case "$target_os" in
freebsd* | openbsd* ) GNUSTEP_CONFIG_FILE=/usr/etc/GNUstep.conf ;;
netbsd* ) GNUSTEP_CONFIG_FILE=/usr/pkg/etc/GNUstep.conf ;;
mingw32* ) GNUSTEP_CONFIG_FILE=/c/GNUstep/GNUstep.conf-dev ;;
*) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;;
esac
fi
AC_MSG_RESULT($GNUSTEP_CONFIG_FILE)
AC_SUBST(GNUSTEP_CONFIG_FILE)
@ -321,11 +321,10 @@ AC_ARG_WITH(system-root,[
to have the GNUSTEP_SYSTEM_ROOT directory in a non-standard place.
Example: --with-system-root=/usr/GNUstep/System
],
GNUSTEP_SYSTEM_ROOT="$withval",
if test "$GNUSTEP_SYSTEM_ROOT" = ""; then
GNUSTEP_SYSTEM_ROOT="$withval",)
if test "$GNUSTEP_SYSTEM_ROOT" = "" -o "$GNUSTEP_SYSTEM_ROOT" = "no"; then
GNUSTEP_SYSTEM_ROOT="$GNUSTEP_ROOT/System"
fi
)
AC_MSG_RESULT($GNUSTEP_SYSTEM_ROOT)
AC_SUBST(GNUSTEP_SYSTEM_ROOT)
@ -339,11 +338,10 @@ AC_ARG_WITH(local-root,[
to have the GNUSTEP_LOCAL_ROOT directory in a non-standard place.
Example: --with-local-root=/usr/local/GNUstep/Local
],
GNUSTEP_LOCAL_ROOT="$withval",
if test "$GNUSTEP_LOCAL_ROOT" = ""; then
GNUSTEP_LOCAL_ROOT="$withval",)
if test "$GNUSTEP_LOCAL_ROOT" = "" -o "$GNUSTEP_LOCAL_ROOT" = "no"; then
GNUSTEP_LOCAL_ROOT="$GNUSTEP_ROOT/Local"
fi
)
AC_MSG_RESULT($GNUSTEP_LOCAL_ROOT)
AC_SUBST(GNUSTEP_LOCAL_ROOT)
@ -357,7 +355,7 @@ AC_ARG_WITH(network-root,[
want to have the GNUSTEP_NETWORK_ROOT directory.
Example: --with-network-root=/usr/local/GNUstep/Network
],
GNUSTEP_NETWORK_ROOT="$withval",
GNUSTEP_NETWORK_ROOT="$withval",)
# By default we disable network root, by setting GNUSTEP_NETWORK_ROOT
# to be the same as GNUSTEP_LOCAL_ROOT. GNUSTEP_NETWORK_ROOT is very
# rarely used, and most users prefer simpler systems with shorter
@ -365,10 +363,9 @@ GNUSTEP_NETWORK_ROOT="$withval",
# again, you can use the --with-network-root=xxx option; pass
# something like --with-network-root=/usr/GNUstep/Network on the
# configure command line.
if test "$GNUSTEP_NETWORK_ROOT" = ""; then
if test "$GNUSTEP_NETWORK_ROOT" = "" -o "$GNUSTEP_NETWORK_ROOT" = "no"; then
GNUSTEP_NETWORK_ROOT="$GNUSTEP_LOCAL_ROOT"
fi
)
AC_MSG_RESULT($GNUSTEP_NETWORK_ROOT)
AC_SUBST(GNUSTEP_NETWORK_ROOT)
@ -385,11 +382,10 @@ AC_ARG_WITH(user-config-file,[
The default is .GNUstep.conf if not specified.
Example: --with-user-config-file=GNUstep/GNUstep.conf
],
GNUSTEP_USER_CONFIG_FILE="$withval",
if test "$GNUSTEP_USER_CONFIG_FILE" = ""; then
GNUSTEP_USER_CONFIG_FILE="$withval",)
if test "$GNUSTEP_USER_CONFIG_FILE" = "" -o "$GNUSTEP_USER_CONFIG_FILE" = "no"; then
GNUSTEP_USER_CONFIG_FILE=".GNUstep.conf"
fi
)
AC_MSG_RESULT($GNUSTEP_USER_CONFIG_FILE)
AC_SUBST(GNUSTEP_USER_CONFIG_FILE)
@ -407,11 +403,10 @@ AC_ARG_WITH(user-dir,[
The default is 'GNUstep'.
Example: --with-user-dir='gnustep'
],
GNUSTEP_USER_DIR="$withval",
if test "$GNUSTEP_USER_DIR" = ""; then
GNUSTEP_USER_DIR="$withval",)
if test "$GNUSTEP_USER_DIR" = "" -o "$GNUSTEP_USER_DIR" = "no"; then
GNUSTEP_USER_DIR="GNUstep"
fi
)
AC_MSG_RESULT($GNUSTEP_USER_DIR)
AC_SUBST(GNUSTEP_USER_DIR)
@ -429,11 +424,10 @@ AC_ARG_WITH(user-defaults-dir,[
all users. The default is 'GNUstep/Defaults'
Example: --with-user-root='GNUstep/Library/Defaults'
],
GNUSTEP_USER_DEFAULTS_DIR="$withval",
if test "$GNUSTEP_USER_DEFAULTS_DIR" = ""; then
GNUSTEP_USER_DEFAULTS_DIR="$withval",)
if test "$GNUSTEP_USER_DEFAULTS_DIR" = "" -o "$GNUSTEP_USER_DEFAULTS_DIR" = "no"; then
GNUSTEP_USER_DEFAULTS_DIR="GNUstep/Defaults"
fi
)
AC_MSG_RESULT($GNUSTEP_USER_DEFAULTS_DIR)
AC_SUBST(GNUSTEP_USER_DEFAULTS_DIR)
@ -639,6 +633,9 @@ AC_ARG_WITH(thread-lib,[
OBJC_THREAD=$withval,
OBJC_THREAD=
)
if test "$OBJC_THREAD" = no; then
OBJC_THREAD=
fi
AC_MSG_CHECKING(whether objc has thread support)