[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Patch to allow texi2any for EMACS manual compilation
From: |
Vincent Belaïche |
Subject: |
RE: Patch to allow texi2any for EMACS manual compilation |
Date: |
Mon, 22 Sep 2014 20:27:22 +0200 |
Answers below,
----------------------------------------
> Date: Sun, 21 Sep 2014 14:18:19 -0700
> From: address@hidden
> To: address@hidden; address@hidden; address@hidden; address@hidden
> Subject: Re: Patch to allow texi2any for EMACS manual compilation
>
> Vincent Belaïche wrote:
> > I propose the following patch (attached) so that one can have the
> > makeinfo program somehow made pointing at texi2any.
>
> I don't see how that patch would make a difference. Older texinfo
> versions don't have texi2any and 'configure' would continue to use
> 'makeinfo' as before. And in newer texinfo versions, 'texi2any' and
> 'makeinfo' are aliases and 'configure' would also continue to use
> 'makeinfo' as before. So why bother to change 'configure'?
>
Yes, with the newer texinfo versions configure would also continue to
use makeinfo *unless* the user has configured his machine so that
makeinfo actually calls tex2iany behind the scene.
I think that this would also happen if the user does
MAKEINFO=texi2any ./configure ... <-- with here other args
But I am not sure --- I have not tested it.
Vincent.
PS: BTW, I did some update to the patch for the sake of simplification
and handling $MAKEINFO = texi2any.
=== modified file 'configure.ac'
--- configure.ac 2014-09-15 00:20:21 +0000
+++ configure.ac 2014-09-22 17:36:48 +0000
@@ -1099,16 +1099,25 @@
## Need makeinfo >= 4.7 (?) to build the manuals.
if test "$MAKEINFO" != "no"; then
- if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then
- MAKEINFO=makeinfo
+ for MAKEINFO_IMPLEMENTATION in makeinfo texi2any; do
+ if test "$MAKEINFO" = "${am_missing_run}${MAKEINFO_IMPLEMENTATION}"; then
+ MAKEINFO=${MAKEINFO_IMPLEMENTATION}
+ fi
+ done
+ MAKEINFO_VERSION=`($MAKEINFO --version) 2>/dev/null`;
+ MAKEINFO_CHECK=no;
+ for MAKEINFO_IMPLEMENTATION in makeinfo texi2any; do
+ case $MAKEINFO_VERSION in
+ "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "4.[7-9]* | \
+ "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "4.[1-9][0-9]* | \
+ "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "[5-9]* | \
+ "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "[1-9][0-9]* )
+ MAKEINFO_CHECK=yes;;
+ esac
+ done
+ if [ $MAKEINFO_CHECK != yes ]; then
+ MAKEINFO=no;
fi
- case `($MAKEINFO --version) 2>/dev/null` in
- 'makeinfo (GNU texinfo) '4.[[7-9]]* | \
- 'makeinfo (GNU texinfo) '4.[[1-9][0-9]]* | \
- 'makeinfo (GNU texinfo) '[[5-9]]* | \
- 'makeinfo (GNU texinfo) '[[1-9][0-9]]* ) ;;
- *) MAKEINFO=no;;
- esac
fi
## Makeinfo is unusual. For a released Emacs, the manuals are