diff options
| author | DJ Delorie <dj@redhat.com> | 2001-09-27 15:44:32 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@gcc.gnu.org> | 2001-09-27 15:44:32 -0400 |
| commit | ae9092da9647424668486f76d322bbc8351857c4 (patch) | |
| tree | c76ca1beed29006d0300f01d0b32d4ba71d0b555 /libiberty | |
| parent | bed2ebd0407e5d78d63ba74abc70c74492611965 (diff) | |
| download | gcc-ae9092da9647424668486f76d322bbc8351857c4.zip gcc-ae9092da9647424668486f76d322bbc8351857c4.tar.gz gcc-ae9092da9647424668486f76d322bbc8351857c4.tar.bz2 | |
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
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/configure.in | 25 | ||||
| -rw-r--r-- | libiberty/functions.texi | 4 |
3 files changed, 21 insertions, 14 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 034a492..c50e448 100644 --- 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 0f1427a..3417827 100644 --- 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 e2ea020..f914adb 100644 --- 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 |