[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 04/26: m4/groff.m4: Couple Texinfo-related macros.
From: |
G. Branden Robinson |
Subject: |
[groff] 04/26: m4/groff.m4: Couple Texinfo-related macros. |
Date: |
Sun, 14 Nov 2021 22:04:24 -0500 (EST) |
gbranden pushed a commit to branch master
in repository groff.
commit a1270cf002158179741f3e6d93b207df8691d895
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Nov 12 12:56:01 2021 +1100
m4/groff.m4: Couple Texinfo-related macros.
[build]: This completes "revamp[ing] Texinfo manual handling", near as I
can tell.
* m4/groff.m4 (GROFF_TEXI2DVI): Add dependency on `GROFF_MAKEINFO`
macro. Rewrite to also test `MAKEINFO` variable, which is empty if
the `makeinfo` command is not installed or too old. Consequently
ignore `texi2dvi` if is too old without having to do a version check
(since it and `makeinfo` are distributed together, both being part of
GNU Texinfo).
* doc/doc.am (.texi.dvi, .texi.pdf): Update error message to indicate
that `texi2dvi` is _either_ missing or too old.
---
ChangeLog | 13 +++++++++++++
doc/doc.am | 6 ++++--
m4/groff.m4 | 16 +++++++++-------
3 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5c1eef0..c9948a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2021-11-12 G. Branden Robinson <g.branden.robinson@gmail.com>
+ * m4/groff.m4 (GROFF_TEXI2DVI): Add dependency on
+ `GROFF_MAKEINFO` macro. Rewrite to also test `MAKEINFO`
+ variable, which is empty if the `makeinfo` command is not
+ installed or too old. Consequently ignore `texi2dvi` if is too
+ old without having to do a version check (since it and
+ `makeinfo` are distributed together, both being part of GNU
+ Texinfo).
+
+ * doc/doc.am (.texi.dvi, .texi.pdf): Update error message to
+ indicate that `texi2dvi` is _either_ missing or too old.
+
+2021-11-12 G. Branden Robinson <g.branden.robinson@gmail.com>
+
* m4/groff.m4 (GROFF_MAKEINFO): Stop throwing a warning if the
installed `makeinfo` is old but the distributed Info manual is
up to date. This is not a configure-time problem; the user will
diff --git a/doc/doc.am b/doc/doc.am
index 70394a7..b3f7cb4 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -409,7 +409,8 @@ if HAVE_TEXI2DVI
$(TEXI2DVI) -e --batch --build-dir=doc/`basename $@`.t2d \
-o $@ $<
else
- @echo "program texi2dvi is missing; cannot generate $@" >&2; \
+ @echo "program texi2dvi is missing or too old;" \
+ "cannot generate $@" >&2; \
exit 1
endif
@@ -423,7 +424,8 @@ if HAVE_TEXI2DVI
$(TEXI2DVI) -e --batch --pdf --build-dir=doc/`basename $@`.t2p \
-o $@ $<
else
- @echo "program texi2dvi is missing; cannot generate $@" >&2; \
+ @echo "program texi2dvi is missing or too old;" \
+ "cannot generate $@" >&2; \
exit 1
endif
diff --git a/m4/groff.m4 b/m4/groff.m4
index b2c5c49..35e42ce 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -205,14 +205,16 @@ AC_DEFUN([GROFF_MAKEINFO],
AC_SUBST([make_install_infodoc])
AC_SUBST([make_uninstall_infodoc])])
+# 'makeinfo' and 'texi2dvi' are distributed together, so if the former
+# is too old, the latter is too.
AC_DEFUN([GROFF_TEXI2DVI],
- [AC_CHECK_PROG([PROG_TEXI2DVI], [texi2dvi], [found], [missing])
- if test "x$PROG_TEXI2DVI" = "xfound"; then
- groff_have_texi2dvi=yes;
- else
- groff_have_texi2dvi=no;
- fi
- ])
+ [AC_REQUIRE([GROFF_MAKEINFO])
+ AC_CHECK_PROG([PROG_TEXI2DVI], [texi2dvi], [found], [missing])
+ groff_have_texi2dvi=no
+ if test "x$PROG_TEXI2DVI" = "xfound" && test "x$MAKEINFO" != "x"
+ then
+ groff_have_texi2dvi=yes
+ fi])
# The following programs are needed for grohtml.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 04/26: m4/groff.m4: Couple Texinfo-related macros.,
G. Branden Robinson <=