about summary refs log tree commit diff
path: root/configure.in
diff options
context:
space:
mode:
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in21
1 files changed, 13 insertions, 8 deletions
diff --git a/configure.in b/configure.in
index f698710ce1..9d12825264 100644
--- a/configure.in
+++ b/configure.in
@@ -431,25 +431,29 @@ fi
 AC_PROG_LN_S
 
 # These programs are version sensitive.
-AC_CHECK_PROG_VER(CC, gcc cc, -v,
-  [version \([egcs0-9.-]*\)],
-  [egcs-2.91.*|egcs-2.90.2[789]|egcs-2.90.[3-9][0-9]|2.8.[1-9]*|2.9.[0-9]*], t)
+AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+  [version \([egcst0-9.-]*\)],
+  [egcs-2.91.*|egcs-2.90.2[789]|egcs-2.90.[3-9][0-9]|*2.8.[1-9]*|*2.9.[0-9]*],
+  critic_missing=t)
 AC_CHECK_PROG_VER(MAKE, make gmake, --version,
   [version \([0-9][0-9.]*\), by],
-  [3.75 | 3.76.[2-9] | 3.7[789]* | 3.[89]*], t)
+  [3.75 | 3.76.[1-9] | 3.7[789]* | 3.[89]*], critic_missing=t)
 
 AC_CHECK_PROG_VER(MSGFMT, msgfmt gmsgfmt, --version,
   [GNU gettext.*\([0-9][0-9]*\.[0-9]*\)],
-  [0.[1-9][0-9] | [1-9].*])
+  [0.[1-9][0-9] | [1-9].*], MSGFMT=: aux_missing=t)
 AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo \([0-9][0-9.]*\)],
-  [3.1[1-9] | 3.[2-9][0-9]])
+  [3.1[1-9] | 3.[2-9][0-9]], MAKEINFO=: aux_missing=t)
 
-test -n "$ac_verc_fatal" && AC_MSG_ERROR([
+if test -n "$critic_missing"; then
+AC_MSG_ERROR([
 *** Some critical program is missing or too old.
 *** Check the INSTALL file for required versions.])
+fi
 
-test -n "$ac_verc_fail" && AC_MSG_WARN([
+test -n "$aux_missing" && AC_MSG_WARN([
 *** An auxiliary program is missing or too old;
 *** some features will be disabled.
 *** Check the INSTALL file for required versions.])
@@ -464,6 +468,7 @@ AC_PROG_CPP
 LIBC_PROG_BINUTILS
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(MIG, mig)
 
 # check if ar takes S
 AC_CACHE_CHECK(for ar S, libc_cv_ar_S, [dnl