mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Try to avoid frightening users if a non-essential test fails. Redirect all the non-essential output to config.log
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24573 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
817e8d99b2
commit
1e888ca9d7
3 changed files with 34 additions and 22 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac: Redirect all error logging for the non-essential
|
||||
gcc and make tests to &5 (which goes into config.log). If they
|
||||
go wrong, the user will see 'no' in the specific feature that is
|
||||
being tested, and can into config.log to check why they failed.
|
||||
* configure: Regenerated.
|
||||
|
||||
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Instance/java-tool.make: Store Java code in the standard
|
||||
|
|
|
|||
24
configure
vendored
24
configure
vendored
|
|
@ -4484,8 +4484,10 @@ else
|
|||
# /\2/ replace the whole lot with the 2^nd subpattern
|
||||
# /\4/ replace the whole lot with the 4^nd subpattern
|
||||
# All square brackets are doubled because this file is processed by m4 first.
|
||||
gs_cv_gcc_major_version=`${CC} -dumpversion | sed "s/\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*\)\([0-9][0-9]*\)\([^0-9].*\)/\2/"`;
|
||||
gs_cv_gcc_minor_version=`${CC} -dumpversion | sed "s/\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*\)\([0-9][0-9]*\)\([^0-9].*\)/\4/"`;
|
||||
# Finally, any error messages are redirected to &5, so that they are logged
|
||||
# into config.log but don't clutter the normal user output.
|
||||
gs_cv_gcc_major_version=`(${CC} -dumpversion | sed "s/\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*\)\([0-9][0-9]*\)\([^0-9].*\)/\2/") 2>&5`;
|
||||
gs_cv_gcc_minor_version=`(${CC} -dumpversion | sed "s/\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*\)\([0-9][0-9]*\)\([^0-9].*\)/\4/") 2>&5`;
|
||||
|
||||
gs_cv_gcc_parsed_version=${gs_cv_gcc_major_version}.${gs_cv_gcc_minor_version}
|
||||
|
||||
|
|
@ -4507,7 +4509,7 @@ if test ! ${GCC} = "yes" ; then
|
|||
echo "$as_me:$LINENO: result: no: it's not gcc" >&5
|
||||
echo "${ECHO_T}no: it's not gcc" >&6
|
||||
else
|
||||
if test "${gs_cv_gcc_major_version}" -ge "3" ; then
|
||||
if test "${gs_cv_gcc_major_version}" -ge "3" >&5 2>&5; then
|
||||
AUTO_DEPENDENCIES=yes
|
||||
echo "$as_me:$LINENO: result: yes: gcc version is ${gs_cv_gcc_parsed_version} >= 3.0" >&5
|
||||
echo "${ECHO_T}yes: gcc version is ${gs_cv_gcc_parsed_version} >= 3.0" >&6
|
||||
|
|
@ -4544,7 +4546,7 @@ if test ! "${GCC}" = "yes" ; then
|
|||
echo "${ECHO_T}no: it's not gcc" >&6
|
||||
else
|
||||
gs_precomp_test_log_file="`pwd`/config-precomp-test.log"
|
||||
gs_precomp_test_results=`(CC="$CC"; export CC; CFLAGS="$CFLAGS"; export CFLAGS; CPPLAGS="$CPPFLAGS"; export CPPFLAGS; LDFLAGS="$LDFLAGS"; export LDFLAGS; LIBS="$LIBS"; export LIBS; cd "$srcdir/config-precomp-test/"; ./run-test.sh "$gs_precomp_test_log_file"; echo $?)`
|
||||
gs_precomp_test_results=`(CC="$CC"; export CC; CFLAGS="$CFLAGS"; export CFLAGS; CPPLAGS="$CPPFLAGS"; export CPPFLAGS; LDFLAGS="$LDFLAGS"; export LDFLAGS; LIBS="$LIBS"; export LIBS; cd "$srcdir/config-precomp-test/"; ./run-test.sh "$gs_precomp_test_log_file"; echo $?) 2>&5`
|
||||
if test "$gs_precomp_test_results" = "0"; then
|
||||
GCC_WITH_PRECOMPILED_HEADERS="yes"
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
|
|
@ -4580,7 +4582,7 @@ if test ! ${GCC} = "yes" ; then
|
|||
echo "$as_me:$LINENO: result: no: it's not gcc" >&5
|
||||
echo "${ECHO_T}no: it's not gcc" >&6
|
||||
else
|
||||
if test "${gs_cv_gcc_major_version}" -ge "4" ; then
|
||||
if test "${gs_cv_gcc_major_version}" -ge "4" >&5 2>&5; then
|
||||
if test "$host_os" = "solaris2.7" -o $"host_os" = "solaris2.6"; then
|
||||
echo "$as_me:$LINENO: result: no: solaris 2.6 or 2.7" >&5
|
||||
echo "${ECHO_T}no: solaris 2.6 or 2.7" >&6
|
||||
|
|
@ -4661,11 +4663,11 @@ echo $ECHO_N "checking for the GNU Make version... $ECHO_C" >&6
|
|||
# To get the make version, take the output of 'make --version', read
|
||||
# only the first line (that we expect to be something like "GNU Make
|
||||
# 3.81"), and ignore everything up to the first numeric character.
|
||||
gs_cv_make_version=`$GNUMAKE --version | head -1 | sed -e 's/^[^0-9]*//'`
|
||||
gs_cv_make_version=`($GNUMAKE --version | head -1 | sed -e 's/^[^0-9]*//') 2>&5`
|
||||
|
||||
# Now check for the major/minor version numbers.
|
||||
gs_cv_make_major_version=`echo ${gs_cv_make_version} | sed -e 's/\([0-9][0-9]*\)[^0-9]\([0-9][0-9]*\).*/\1/'`
|
||||
gs_cv_make_minor_version=`echo ${gs_cv_make_version} | sed -e 's/\([0-9][0-9]*\)[^0-9]\([0-9][0-9]*\).*/\2/'`
|
||||
gs_cv_make_major_version=`(echo ${gs_cv_make_version} | sed -e 's/\([0-9][0-9]*\)[^0-9]\([0-9][0-9]*\).*/\1/') 2>&5`
|
||||
gs_cv_make_minor_version=`(echo ${gs_cv_make_version} | sed -e 's/\([0-9][0-9]*\)[^0-9]\([0-9][0-9]*\).*/\2/') 2>&5`
|
||||
echo "$as_me:$LINENO: result: version: ${gs_cv_make_major_version}.${gs_cv_make_minor_version}" >&5
|
||||
echo "${ECHO_T}version: ${gs_cv_make_major_version}.${gs_cv_make_minor_version}" >&6
|
||||
|
||||
|
|
@ -4676,12 +4678,12 @@ echo $ECHO_N "checking if GNU Make has the info function... $ECHO_C" >&6
|
|||
# assume 'no' here. If things go wrong, you'll lost some
|
||||
# non-essential features.
|
||||
MAKE_WITH_INFO_FUNCTION=no
|
||||
if test "${gs_cv_make_major_version}" -ge "4"; then
|
||||
if test "${gs_cv_make_major_version}" -ge "4" >&5 2>&5; then
|
||||
MAKE_WITH_INFO_FUNCTION=yes
|
||||
fi
|
||||
|
||||
if test "${gs_cv_make_major_version}" -ge "3"; then
|
||||
if test "${gs_cv_make_minor_version}" -ge "81"; then
|
||||
if test "${gs_cv_make_major_version}" -ge "3" >&5 2>&5; then
|
||||
if test "${gs_cv_make_minor_version}" -ge "81" >&5 2>&5; then
|
||||
MAKE_WITH_INFO_FUNCTION=yes
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
24
configure.ac
24
configure.ac
|
|
@ -1058,8 +1058,10 @@ else
|
|||
# /\2/ replace the whole lot with the 2^nd subpattern
|
||||
# /\4/ replace the whole lot with the 4^nd subpattern
|
||||
# All square brackets are doubled because this file is processed by m4 first.
|
||||
gs_cv_gcc_major_version=`${CC} -dumpversion | sed "s/\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]].*\)/\2/"`;
|
||||
gs_cv_gcc_minor_version=`${CC} -dumpversion | sed "s/\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]].*\)/\4/"`;
|
||||
# Finally, any error messages are redirected to &5, so that they are logged
|
||||
# into config.log but don't clutter the normal user output.
|
||||
gs_cv_gcc_major_version=`(${CC} -dumpversion | sed "s/\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]].*\)/\2/") 2>&5`;
|
||||
gs_cv_gcc_minor_version=`(${CC} -dumpversion | sed "s/\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]].*\)/\4/") 2>&5`;
|
||||
|
||||
gs_cv_gcc_parsed_version=${gs_cv_gcc_major_version}.${gs_cv_gcc_minor_version}
|
||||
|
||||
|
|
@ -1078,7 +1080,7 @@ AUTO_DEPENDENCIES=""
|
|||
if test ! ${GCC} = "yes" ; then
|
||||
AC_MSG_RESULT(no: it's not gcc)
|
||||
else
|
||||
if test "${gs_cv_gcc_major_version}" -ge "3" ; then
|
||||
if test "${gs_cv_gcc_major_version}" -ge "3" >&5 2>&5; then
|
||||
AUTO_DEPENDENCIES=yes
|
||||
AC_MSG_RESULT(yes: gcc version is ${gs_cv_gcc_parsed_version} >= 3.0)
|
||||
else
|
||||
|
|
@ -1111,7 +1113,7 @@ if test ! "${GCC}" = "yes" ; then
|
|||
AC_MSG_RESULT(no: it's not gcc)
|
||||
else
|
||||
gs_precomp_test_log_file="`pwd`/config-precomp-test.log"
|
||||
gs_precomp_test_results=`(CC="$CC"; export CC; CFLAGS="$CFLAGS"; export CFLAGS; CPPLAGS="$CPPFLAGS"; export CPPFLAGS; LDFLAGS="$LDFLAGS"; export LDFLAGS; LIBS="$LIBS"; export LIBS; cd "$srcdir/config-precomp-test/"; ./run-test.sh "$gs_precomp_test_log_file"; echo $?)`
|
||||
gs_precomp_test_results=`(CC="$CC"; export CC; CFLAGS="$CFLAGS"; export CFLAGS; CPPLAGS="$CPPFLAGS"; export CPPFLAGS; LDFLAGS="$LDFLAGS"; export LDFLAGS; LIBS="$LIBS"; export LIBS; cd "$srcdir/config-precomp-test/"; ./run-test.sh "$gs_precomp_test_log_file"; echo $?) 2>&5`
|
||||
if test "$gs_precomp_test_results" = "0"; then
|
||||
GCC_WITH_PRECOMPILED_HEADERS="yes"
|
||||
AC_MSG_RESULT(yes)
|
||||
|
|
@ -1143,7 +1145,7 @@ SOLARIS_SHARED=""
|
|||
if test ! ${GCC} = "yes" ; then
|
||||
AC_MSG_RESULT(no: it's not gcc)
|
||||
else
|
||||
if test "${gs_cv_gcc_major_version}" -ge "4" ; then
|
||||
if test "${gs_cv_gcc_major_version}" -ge "4" >&5 2>&5; then
|
||||
if test "$host_os" = "solaris2.7" -o $"host_os" = "solaris2.6"; then
|
||||
AC_MSG_RESULT(no: solaris 2.6 or 2.7)
|
||||
else
|
||||
|
|
@ -1180,11 +1182,11 @@ AC_MSG_CHECKING(for the GNU Make version)
|
|||
# To get the make version, take the output of 'make --version', read
|
||||
# only the first line (that we expect to be something like "GNU Make
|
||||
# 3.81"), and ignore everything up to the first numeric character.
|
||||
gs_cv_make_version=`$GNUMAKE --version | head -1 | sed -e 's/^[[^0-9]]*//'`
|
||||
gs_cv_make_version=`($GNUMAKE --version | head -1 | sed -e 's/^[[^0-9]]*//') 2>&5`
|
||||
|
||||
# Now check for the major/minor version numbers.
|
||||
gs_cv_make_major_version=`echo ${gs_cv_make_version} | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]]\([[0-9]][[0-9]]*\).*/\1/'`
|
||||
gs_cv_make_minor_version=`echo ${gs_cv_make_version} | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]]\([[0-9]][[0-9]]*\).*/\2/'`
|
||||
gs_cv_make_major_version=`(echo ${gs_cv_make_version} | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]]\([[0-9]][[0-9]]*\).*/\1/') 2>&5`
|
||||
gs_cv_make_minor_version=`(echo ${gs_cv_make_version} | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]]\([[0-9]][[0-9]]*\).*/\2/') 2>&5`
|
||||
AC_MSG_RESULT(version: ${gs_cv_make_major_version}.${gs_cv_make_minor_version})
|
||||
|
||||
AC_MSG_CHECKING(if GNU Make has the info function)
|
||||
|
|
@ -1193,12 +1195,12 @@ AC_MSG_CHECKING(if GNU Make has the info function)
|
|||
# assume 'no' here. If things go wrong, you'll lost some
|
||||
# non-essential features.
|
||||
MAKE_WITH_INFO_FUNCTION=no
|
||||
if test "${gs_cv_make_major_version}" -ge "4"; then
|
||||
if test "${gs_cv_make_major_version}" -ge "4" >&5 2>&5; then
|
||||
MAKE_WITH_INFO_FUNCTION=yes
|
||||
fi
|
||||
|
||||
if test "${gs_cv_make_major_version}" -ge "3"; then
|
||||
if test "${gs_cv_make_minor_version}" -ge "81"; then
|
||||
if test "${gs_cv_make_major_version}" -ge "3" >&5 2>&5; then
|
||||
if test "${gs_cv_make_minor_version}" -ge "81" >&5 2>&5; then
|
||||
MAKE_WITH_INFO_FUNCTION=yes
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue