From 1a78a35acfb696d2262b7c2d707b9e6421c99aaa Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Tue, 13 Nov 2001 03:54:15 +0000
Subject: merge from gcc

---
 libiberty/configure.in | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'libiberty/configure.in')

diff --git a/libiberty/configure.in b/libiberty/configure.in
index 3417827..505b520 100644
--- a/libiberty/configure.in
+++ b/libiberty/configure.in
@@ -52,15 +52,20 @@ AC_SUBST(NOTMAINT)dnl
 # Do we have a single-tree copy of texinfo?  Even if we do, we can't
 # rely on it - libiberty is built before texinfo.
 AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
-BUILD_INFO=info
-case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
-  x*\ [[1-3]].* )
-    MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required ;true"
+if test "x$MAKEINFO" = "x"; then
+    MAKEINFO="@echo makeinfo missing; true"
     BUILD_INFO=
-    AC_MSG_WARN([
+else
+    BUILD_INFO=info
+    case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
+      x*\ [[1-3]].* )
+	MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"
+	BUILD_INFO=
+	AC_MSG_WARN([
 *** Makeinfo is too old. Info documentation will not be built.])
-    ;;
-esac
+	;;
+    esac
+fi
 AC_SUBST(MAKEINFO)
 AC_SUBST(BUILD_INFO)
 
-- 
cgit v1.1