configure.in: Don't use in-tree texinfo, because libiberty must be built before it.

* configure.in: Don't use in-tree texinfo, because libiberty must
be built before it.  Check for makeinfo version 4 or higher.
* functions.texi: Regenerate.

From-SVN: r45846

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 034a492fcb52a85f2ca0faa327066552c8805470..c50e448350c920f90b5234b392e479d1710b5b39 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-27  DJ Delorie  <dj@redhat.com>
+
+       * configure.in: Don't use in-tree texinfo, because libiberty must
+       be built before it.  Check for makeinfo version 4 or higher.
+       * functions.texi: Regenerate.
+       
 2001-09-20  DJ Delorie  <dj@redhat.com>
            Phil Edwards  <pedwards@disaster.jaj.com>
        

diff --git a/libiberty/configure.in b/libiberty/configure.in
index 0f1427a4e93c42d79d54c333aaa741220ede9cee..3417827b42c33ed0d395291d05c7d174f6997f7b 100644 (file)
--- a/libiberty/configure.in
+++ b/libiberty/configure.in
@@ -49,18 +49,19 @@ fi
 AC_SUBST(MAINT)dnl
 AC_SUBST(NOTMAINT)dnl
 
-# Do we have a single-tree copy of texinfo?
-if test -f $srcdir/../texinfo/Makefile.in; then
-  MAKEINFO='$(objdir)/../texinfo/makeinfo/makeinfo'
-  AC_MSG_RESULT([Using makeinfo from the unified source tree.])
-else
-  AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
-fi
-if test x"$MAKEINFO" = x""; then
-  BUILD_INFO=
-else
-  BUILD_INFO=info
-fi
+# 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"
+    BUILD_INFO=
+    AC_MSG_WARN([
+*** Makeinfo is too old. Info documentation will not be built.])
+    ;;
+esac
+AC_SUBST(MAKEINFO)
 AC_SUBST(BUILD_INFO)
 
 AC_CHECK_PROG(PERL, perl, perl, )

diff --git a/libiberty/functions.texi b/libiberty/functions.texi
index e2ea020d2055bf520446bf33a36ab13cc69e626c..f914adb436b0b358fce1a9729232449415eda09d 100644 (file)
--- a/libiberty/functions.texi
+++ b/libiberty/functions.texi
@@ -65,14 +65,14 @@ should be sorted in ascending order according to the @var{compar}
 comparison function.  This routine should take two arguments pointing to
 the @var{key} and to an array member, in that order, and should return an
 integer less than, equal to, or greater than zero if the @var{key} object
-is respecitively less than, matching, or greater than the array member.
+is respectively less than, matching, or greater than the array member.
 
 @end deftypefn
 
 @c bzero.c:6
 @deftypefn Supplemental void bzero (char *@var{mem}, int @var{count})
 
-Zeros @var{count} bytes starting at @var{mem}.  Use if this function
+Zeros @var{count} bytes starting at @var{mem}.  Use of this function
 is deprecated in favor of @code{memset}.
 
 @end deftypefn