diff options
| author | Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> | 2023-06-19 11:19:25 +0900 |
|---|---|---|
| committer | Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> | 2023-06-19 11:19:25 +0900 |
| commit | ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4 (patch) | |
| tree | a0245139b13e323e4fd67afb1918bc2d4486eeab | |
| parent | cd1a0a70972e717aa93c5fd6b36f476b5593c206 (diff) | |
| download | zsh-ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4.tar.gz zsh-ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4.tar.xz zsh-ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4.zip | |
51862: support texinfo-7.0
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Doc/Makefile.in | 3 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ca290ea2a..14349dcf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2023-06-19 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> + + * 51862: Doc/Makefile.in, configure.ac: support texinfo-7.0 + 2023-06-08 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> * 51826: Src/hist.c: correctly handle metafied null character diff --git a/Doc/Makefile.in b/Doc/Makefile.in index 136b080d6..dabe11fe3 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -43,6 +43,7 @@ TEXI2DVI = @TEXI2DVI@ DVIPS = dvips TEXI2PDF = @TEXI2PDF@ TEXI2HTML = @TEXI2HTML@ +SET_TEXI2ANY_VAR = @SET_TEXI2ANY_VAR@ PAPERSIZE = @PAPERSIZE@ .SUFFIXES: .yo .1 @@ -266,7 +267,7 @@ texi2html.conf: $(sdir_top)/Config/version.mk d=`echo $(VERSION_DATE)`; \ v="<font size=\"-1\">Zsh version $(VERSION), released on $$d.</font>"; \ case '$(TEXI2HTML)' in \ - *texi2any*) echo "set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \ + *texi2any*) echo "$(SET_TEXI2ANY_VAR)('PRE_BODY_CLOSE','$$v');" ;; \ *) echo "\$$PRE_BODY_CLOSE = '$$v';" ;; \ esac > $@ diff --git a/configure.ac b/configure.ac index 4710d1659..ba76f9a60 100644 --- a/configure.ac +++ b/configure.ac @@ -623,7 +623,12 @@ fi if test x"$TEXI2HTML" = xtexi2any; then TEXI2HTML='texi2any -c TEXI2HTML=1' + case `texi2any --version 2>/dev/null | sed -e 's/^.*) *//' -e 1q` in + [[1-6]].*) SET_TEXI2ANY_VAR=set_from_init_file ;; + *) SET_TEXI2ANY_VAR=texinfo_set_from_init_file ;; + esac fi +AC_SUBST(SET_TEXI2ANY_VAR) case "$LC_PAPER" in ??_US*) PAPERSIZE=us ;; |