diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-10-12 15:55:04 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-10-12 15:55:04 +0000 |
| commit | 5048e5167716138f9f3ff727dfb2b8b572445c5e (patch) | |
| tree | dbbba9fd49a5595280ff934c7c6f69846e8c579e /gdb/configure.ac | |
| parent | 0574c78f39bf3ceccbd57bcd1b2973b683e8dd06 (diff) | |
| download | gdb-5048e5167716138f9f3ff727dfb2b8b572445c5e.zip gdb-5048e5167716138f9f3ff727dfb2b8b572445c5e.tar.gz gdb-5048e5167716138f9f3ff727dfb2b8b572445c5e.tar.bz2 | |
gdb/
Fix compatibility with texinfo versions older than 4.12.
* Makefile.in (MAKEINFO): Set to @MAKEINFO@.
(MAKEINFOFLAGS, MAKEINFO_EXTRA_FLAGS, MAKEINFO_CMD): New.
(MAKEHTMLFLAGS): Use MAKEINFO_CMD.
(FLAGS_TO_PASS): Add MAKEINFOFLAGS and MAKEINFO_EXTRA_FLAGS.
* configure: Regenerate.
* configure.ac (MAKEINFO): Find it, from libiberty/configure.ac.
(MAKEINFOFLAGS): Pre-set it to --split-size=5000000.
(MAKEINFO_EXTRA_FLAGS): New test for -DHAVE_MAKEINFO_CLICK.
gdb/doc/
Fix compatibility with texinfo versions older than 4.12.
* Makefile.in (MAKEINFO): Set to @MAKEINFO@.
(MAKEINFOFLAGS, MAKEINFO_EXTRA_FLAGS, MAKEINFO_CMD): New.
(MAKEHTMLFLAGS): Use MAKEINFO_CMD.
(gdb.info, gdbint.info, stabs.info, annotate.info): Use MAKEINFO_CMD.
* gdb.texinfo (Tail Call Frames): Convert @arrow{} to @click, when possible.
Make the conversion conditional on HAVE_MAKEINFO_CLICK, using variables
CALLSEQ1A, CALLSEQ1B, CALLSEQ2A and CALLSEQ2B.
Diffstat (limited to 'gdb/configure.ac')
| -rw-r--r-- | gdb/configure.ac | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/gdb/configure.ac b/gdb/configure.ac index 8c12a44..fbbb2de 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -87,6 +87,38 @@ PACKAGE=gdb AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ]) AC_SUBST(PACKAGE) +# Do we have a single-tree copy of texinfo? Even if we do, we can't +# rely on it - libiberty is built before texinfo. +AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, ) +if test "x$MAKEINFO" = "x"; then + AC_ERROR([makeinfo is required for compilation]) +else + case "$MAKEINFO" in + */missing\ makeinfo*) + AC_ERROR([makeinfo is required for compilation]) + ;; + esac +fi +AC_SUBST(MAKEINFO) + +# --split-size=5000000 may be already in $MAKEINFO from parent configure. +# Re-running configure in gdb/ would lose it so ensure it stays present. +MAKEINFOFLAGS=${MAKEINFOFLAGS---split-size=5000000} +AC_SUBST(MAKEINFOFLAGS) + +MAKEINFO_EXTRA_FLAGS="" +AC_CACHE_CHECK([whether $MAKEINFO supports @click], gdb_cv_have_makeinfo_click, + [echo '@clicksequence{a @click{} b}' >conftest.texinfo + if eval "$MAKEINFO conftest.texinfo >&5 2>&5"; 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 + MAKEINFO_EXTRA_FLAGS="$MAKEINFO_EXTRA_FLAGS -DHAVE_MAKEINFO_CLICK" +fi +AC_SUBST(MAKEINFO_EXTRA_FLAGS) + # GDB does not use automake, but gnulib does. This line lets us # generate its Makefile.in. AM_INIT_AUTOMAKE(gdb, UNUSED-VERSION, [no-define]) |