2001-05-14 Roland McGrath <roland@frob.com>

* configure.in (critic_missing, aux_missing): Collect in these vars
	the names of the missing programs, and include them in the error msgs.
	* configure: Regenerated.
This commit is contained in:
Roland McGrath 2001-05-14 23:21:54 +00:00
parent 3eab00bd35
commit aefdff34cd
2 changed files with 15 additions and 12 deletions

12
configure vendored
View File

@ -1451,7 +1451,7 @@ echo "configure:1443: checking version of $CC" >&5
echo "$ac_t""$ac_prog_version" 1>&6
fi
if test $ac_verc_fail = yes; then
critic_missing=t
critic_missing="$critic_missing make"
fi
for ac_prog in gnumake gmake make
@ -1512,7 +1512,7 @@ fi
if test -n "$critic_missing"; then
{ echo "configure: error:
*** Some critical program is missing or too old.
*** These critical programs are missing or too old:$critic_missing
*** Check the INSTALL file for required versions." 1>&2; exit 1; }
fi
@ -1568,7 +1568,7 @@ echo "configure:1560: checking version of $MSGFMT" >&5
echo "$ac_t""$ac_prog_version" 1>&6
fi
if test $ac_verc_fail = yes; then
MSGFMT=: aux_missing=t
MSGFMT=: aux_missing="$aux_missing msgfmt"
fi
for ac_prog in makeinfo
@ -1622,7 +1622,7 @@ echo "configure:1614: checking version of $MAKEINFO" >&5
echo "$ac_t""$ac_prog_version" 1>&6
fi
if test $ac_verc_fail = yes; then
MAKEINFO=: aux_missing=t
MAKEINFO=: aux_missing="$aux_missing makeinfo"
fi
for ac_prog in gsed sed
@ -1676,7 +1676,7 @@ echo "configure:1668: checking version of $SED" >&5
echo "$ac_t""$ac_prog_version" 1>&6
fi
if test $ac_verc_fail = yes; then
SED=: aux_missing=t
SED=: aux_missing="$aux_missing sed"
fi
@ -2065,7 +2065,7 @@ fi
# [2.10.[1-9]* | 2.1[1-9]* | 2.9-ia64-*], AS=: critic_missing=t)
test -n "$aux_missing" && echo "configure: warning:
*** An auxiliary program is missing or too old;
*** These auxiliary programs are missing or too old:$aux_missing
*** some features will be disabled.
*** Check the INSTALL file for required versions." 1>&2

View File

@ -559,7 +559,7 @@ AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
[version \([egcygnustpi-]*[0-9.]*\)],
[*gcc-2.9[5-9].*|*2.8.[1-9]*|*2.9|*2.9.[0-9]*|2.9[5-9]*|3.[0-9]*|cygnus-2.9[1-9]*|gcc-2.9[5-9]|gcc-2.1[0-9][0-9]|sgicc-*],
critic_missing=t)
critic_missing="$critic_missing make")
AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
[GNU Make[^0-9]*\([0-9][0-9.]*\)],
[3.79* | 3.[89]*], critic_missing=t)
@ -567,20 +567,23 @@ AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
if test -n "$critic_missing"; then
AC_MSG_ERROR([
*** Some critical program is missing or too old.
*** These critical programs are missing or too old:$critic_missing
*** Check the INSTALL file for required versions.])
fi
AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
[GNU gettext.* \([0-9]*\.[0-9.]*\)],
[0.10.3[6-9]* | 0.10.[4-9][0-9]* | 0.1[1-9]* | 0.[2-9][0-9]* | [1-9].*], MSGFMT=: aux_missing=t)
[0.10.3[6-9]* | 0.10.[4-9][0-9]* | 0.1[1-9]* | 0.[2-9][0-9]* | [1-9].*],
MSGFMT=: aux_missing="$aux_missing msgfmt")
AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
[GNU texinfo.* \([0-9][0-9.]*\)],
[4.*], MAKEINFO=: aux_missing=t)
[4.*],
MAKEINFO=: aux_missing="$aux_missing makeinfo")
AC_CHECK_PROG_VER(SED, gsed sed, --version,
[GNU sed version \([0-9]*\.[0-9.]*\)],
[3.0[2-9]*|3.[1-9]*|[4-9]*], SED=: aux_missing=t)
[3.0[2-9]*|3.[1-9]*|[4-9]*],
SED=: aux_missing="$aux_missing sed")
AC_PROG_CC_LOCAL
AC_CANONICAL_BUILD
@ -600,7 +603,7 @@ AC_CHECK_TOOL(MIG, mig)
# [2.10.[1-9]* | 2.1[1-9]* | 2.9-ia64-*], AS=: critic_missing=t)
test -n "$aux_missing" && AC_MSG_WARN([
*** An auxiliary program is missing or too old;
*** These auxiliary programs are missing or too old:$aux_missing
*** some features will be disabled.
*** Check the INSTALL file for required versions.])