This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[patch] New test+use texinfo @click - @HAVE_MAKEINFO_CLICK@ [Re: doc build failure (Re: [patch 04/12] entryval#3: Virtual tail call frames)]
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: Ulrich Weigand <uweigand at de dot ibm dot com>
- Cc: eliz at gnu dot org, gdb-patches at sourceware dot org
- Date: Mon, 10 Oct 2011 16:57:49 +0200
- Subject: [patch] New test+use texinfo @click - @HAVE_MAKEINFO_CLICK@ [Re: doc build failure (Re: [patch 04/12] entryval#3: Virtual tail call frames)]
- References: <E1RDGIs-0005T4-Eo@fencepost.gnu.org> <201110101357.p9ADvmvK012977@d06av02.portsmouth.uk.ibm.com>
On Mon, 10 Oct 2011 15:57:48 +0200, Ulrich Weigand wrote:
> Eli Zaretskii wrote:
> > @arrow is from a relatively new version of Texinfo. What version do
> > you have on that machine?
>
> This is a RHEL 5 machine, which has:
>
> [uweigand@pctc1 ~]$ makeinfo --version
> makeinfo (GNU texinfo) 4.8
I will check in the patch below if no comments appear.
Thanks,
Jan
gdb/
2011-10-10 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix compatibility with texinfo versions older than 4.12.
* configure: Regenerate.
* configure.ac (HAVE_MAKEINFO_CLICK): New test for AC_SUBST.
gdb/doc/
2011-10-10 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix compatibility with texinfo versions older than 4.12.
* Makefile.in (MAKEINFO): Add @HAVE_MAKEINFO_CLICK@.
* gdb.texinfo (Tail Call Frames): Convert @arrow{} to @click, make the
sentence conditional on HAVE_MAKEINFO_CLICK.
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2179,6 +2179,20 @@ dnl At the moment, we just assume it's UTF-8.
AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
[Define to be a string naming the default host character set.])
+AC_CACHE_CHECK([whether makeinfo supports @click], gdb_cv_have_makeinfo_click,
+ [echo '@clicksequence{a @click{} b}' >conftest.texinfo
+ if makeinfo conftest.texinfo >/dev/null 2>/dev/null; then
+ gdb_cv_have_makeinfo_click=yes
+ else
+ gdb_cv_have_makeinfo_click=no
+ fi])
+if test x"$gdb_cv_have_makeinfo_click" = xyes; then
+ HAVE_MAKEINFO_CLICK="-DHAVE_MAKEINFO_CLICK"
+else
+ HAVE_MAKEINFO_CLICK=""
+fi
+AC_SUBST(HAVE_MAKEINFO_CLICK)
+
AC_OUTPUT(Makefile .gdbinit:gdbinit.in doc/Makefile gnulib/Makefile data-directory/Makefile,
[
case x$CONFIG_HEADERS in
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -45,7 +45,7 @@ gdbdir = $(srcdir)/..
TEXIDIR=${gdbdir}/../texinfo
# where to find makeinfo, preferably one designed for texinfo-2
-MAKEINFO=makeinfo
+MAKEINFO=makeinfo @HAVE_MAKEINFO_CLICK@
MAKEHTML = $(MAKEINFO) --html
MAKEHTMLFLAGS =
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -9789,11 +9789,13 @@ tailcall: reduced: 0x4004d2(a) |
#2 0x0000000000400395 in main () at t.c:9
@end smallexample
-Frames #0 and #2 are real, #1 is a virtual tail call frame. The code can have
-possible execution paths
-@code{main@arrow{}a@arrow{}b@arrow{}c@arrow{}d@arrow{}f} or
-@code{main@arrow{}a@arrow{}b@arrow{}e@arrow{}f}, @value{GDBN} cannot find which
+Frames #0 and #2 are real, #1 is a virtual tail call frame.
+@ifset HAVE_MAKEINFO_CLICK
+The code can have possible execution paths
+@clicksequence{main@click{}a@click{}b@click{}c@click{}d@click{}f} or
+@clicksequence{main@click{}a@click{}b@click{}e@click{}f}, @value{GDBN} cannot find which
one from the inferior state.
+@end ifset
@code{initial:} state shows some random possible calling sequence @value{GDBN}
has found. It then finds another possible calling sequcen - that one is