Subject: bug#57258: two patches to silence `autogen.sh`

From: Werner LEMBERG <[email-masked]>
Date: Wed, 17 Aug 2022 08:07:55 +0000 (UTC)

I've just discovered that two weeks ago I sent this e-mail to
'auctex', which is the wrong list.  No wonder that there wasn't any
reaction :-)

The attached two patches make `./autogen.sh` run without warnings.

    Werner
>From 6154ebc4e11856bbffab8cad24895083c7175d8c Mon Sep 17 00:00:00 2001
From: Werner Lemberg <[email-masked]>
Date: Mon, 1 Aug 2022 16:33:11 +0200
Subject: [PATCH 1/2] Fix `autoconf` warnings

* configure.ac: Run `autoupdate`.
* aclocal.m4: s/AC_FD_CC/AS_MESSAGE_LOG_FD/.
---
 aclocal.m4   | 6 +++---
 configure.ac | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 383a5935..c6c73054 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,10 +13,10 @@ dnl assigned from the command line arguments from $5.
 AC_DEFUN(EMACS_LISP, [
   elisp="$2"
   OUTPUT=./conftest-$$
-  echo "${EMACS}" -batch $3 -eval "(let* (patsubst([$4], [\w+], [(\&(pop command-line-args-left))])(x ${elisp})) (write-region (if (stringp x) x (prin1-to-string x)) nil \"${OUTPUT}\"))" $5 >& AC_FD_CC 2>&1
-  "${EMACS}" -batch $3 -eval "(let* (patsubst([$4], [\w+], [(\&(pop command-line-args-left))])(x ${elisp})) (write-region (if (stringp x) x (prin1-to-string x)) nil \"${OUTPUT}\"))" $5 >& AC_FD_CC 2>&1
+  echo "${EMACS}" -batch $3 -eval "(let* (patsubst([$4], [\w+], [(\&(pop command-line-args-left))])(x ${elisp})) (write-region (if (stringp x) x (prin1-to-string x)) nil \"${OUTPUT}\"))" $5 >& AS_MESSAGE_LOG_FD 2>&1
+  "${EMACS}" -batch $3 -eval "(let* (patsubst([$4], [\w+], [(\&(pop command-line-args-left))])(x ${elisp})) (write-region (if (stringp x) x (prin1-to-string x)) nil \"${OUTPUT}\"))" $5 >& AS_MESSAGE_LOG_FD 2>&1
   $1="`cat ${OUTPUT}`"
-  echo "=> [$]{$1}" >& AC_FD_CC 2>&1
+  echo "=> [$]{$1}" >& AS_MESSAGE_LOG_FD 2>&1
   rm -f ${OUTPUT}
 ])
 
diff --git a/configure.ac b/configure.ac
index fe7616d5..81c09653 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl along with AUCTeX; see the file COPYING.  If not, write to the Free
 dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 dnl MA 02110-1301, USA.
 
-AC_INIT(auctex,13.1,[email-masked])
+AC_INIT([auctex],[13.1],[[email-masked]])
 
 AC_CHECK_PROGS_REQUIRED(MAKECMD, make, [make not found, aborting!])
 AC_PROG_MAKE_SET
@@ -268,7 +268,8 @@ AC_SHELL_QUOTIFY(TEXI2HTML)
 AC_SHELL_QUOTIFY(TEXI2DVI)
 AC_SHELL_QUOTIFY(TEXI2PDF)
 
-AC_OUTPUT(Makefile tex-site.el.out:tex-site.el.in doc/Makefile auctex.el preview.el latex/Makefile)
+AC_CONFIG_FILES([Makefile tex-site.el.out:tex-site.el.in doc/Makefile auctex.el preview.el latex/Makefile])
+AC_OUTPUT

 cat >&2 <<EOF
-- 
2.37.1

>From 4531e7362e1c87fc32f6ec5e20cafe53e00da86b Mon Sep 17 00:00:00 2001
From: Werner Lemberg <[email-masked]>
Date: Mon, 1 Aug 2022 16:45:23 +0200
Subject: [PATCH 2/2] Avoid `makeinfo` warnings

* doc/changes.texi, doc/wininstall.texi: Protect `@cindex` entries with
`@ifclear rawfile`.
---
 doc/changes.texi    | 2 ++
 doc/wininstall.texi | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/doc/changes.texi b/doc/changes.texi
index 6c0a5723..59949002 100644
--- a/doc/changes.texi
+++ b/doc/changes.texi
@@ -1136,8 +1136,10 @@ inserted by typing @key{"}.
 Completion support for options of some @LaTeX{} packages was added.
 
 @item
+@ifclear rawfile
 @cindex @file{auctex.el}
 @cindex @file{tex-site.el}
+@end ifclear
 Already in version 11.81 the way to activate @AUCTeX{} changed
 substantially.  This should now be done with @code{(load "auctex.el" nil
 t t)} instead of the former @code{(require 'tex-site)}.  Related to this
diff --git a/doc/wininstall.texi b/doc/wininstall.texi
index 230f8e22..1c812d4d 100644
--- a/doc/wininstall.texi
+++ b/doc/wininstall.texi
@@ -47,8 +47,10 @@ containing the programs to the @env{PATH} environment variable if
 necessary.  Here is how to do that in W2000/XP:
 
 @enumerate
+@ifclear rawfile
 @cindex Adding to @env{PATH} in Windows
 @cindex @env{PATH} in Windows
+@end ifclear
 @item
 On the desktop, right click ``My Computer'' and select properties.
 @item
@@ -303,7 +305,9 @@ in either a site-wide @file{site-start.el} or your personal startup file
 (usually accessible as @file{~/.emacs} or @file{~/.emacs.d/init.el} from
 within Emacs).
 
+@ifclear rawfile
 @cindex @file{tex-mik.el}
+@end ifclear
 The default configuration of @AUCTeX{} is probably not the best fit for
 Windows systems with MiK@TeX{}.  You might want to add
 @lisp
-- 
2.37.1