diff options
| -rwxr-xr-x | gdb/configure | 8 | ||||
| -rw-r--r-- | gdb/configure.ac | 3 | ||||
| -rw-r--r-- | gdb/doc/Makefile.in | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/gdb/configure b/gdb/configure index 8b20399..1114bcd 100755 --- a/gdb/configure +++ b/gdb/configure @@ -746,6 +746,7 @@ LIBEXPAT HAVE_LIBEXPAT JIT_READER_DIR TARGET_PTR +READLINE_DOC_SOURCE_INCLUDES READLINE_TEXI_INCFLAG READLINE_CFLAGS READLINE_DEPS @@ -11449,7 +11450,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11452 "configure" +#line 11453 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11555,7 +11556,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11558 "configure" +#line 11559 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -20793,17 +20794,20 @@ $as_echo "$gdb_cv_readline_ok" >&6; } READLINE_DEPS= READLINE_CFLAGS= READLINE_TEXI_INCFLAG= + READLINE_DOC_SOURCE_INCLUDES='$(READLINE_SYSTEM_DOC_INCLUDES)' else READLINE='$(READLINE_DIR)/libreadline.a' READLINE_DEPS='$(READLINE)' READLINE_CFLAGS='-I$(READLINE_SRC)/..' READLINE_TEXI_INCFLAG='-I $(READLINE_DIR)' + READLINE_DOC_SOURCE_INCLUDES='$(READLINE_INTREE_DOC_INCLUDES)' fi + # Generate jit-reader.h # This is typedeffed to GDB_CORE_ADDR in jit-reader.h diff --git a/gdb/configure.ac b/gdb/configure.ac index 79eb013..47e35f4 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -644,16 +644,19 @@ if test "$with_system_readline" = yes; then READLINE_DEPS= READLINE_CFLAGS= READLINE_TEXI_INCFLAG= + READLINE_DOC_SOURCE_INCLUDES='$(READLINE_SYSTEM_DOC_INCLUDES)' else READLINE='$(READLINE_DIR)/libreadline.a' READLINE_DEPS='$(READLINE)' READLINE_CFLAGS='-I$(READLINE_SRC)/..' READLINE_TEXI_INCFLAG='-I $(READLINE_DIR)' + READLINE_DOC_SOURCE_INCLUDES='$(READLINE_INTREE_DOC_INCLUDES)' fi AC_SUBST(READLINE) AC_SUBST(READLINE_DEPS) AC_SUBST(READLINE_CFLAGS) AC_SUBST(READLINE_TEXI_INCFLAG) +AC_SUBST(READLINE_DOC_SOURCE_INCLUDES) # Generate jit-reader.h diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index 5d40aa2..110b608 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -121,6 +121,11 @@ PDFTEX = pdftex # Program to generate Postscript files from DVI files. DVIPS = dvips +# Readline includes. +READLINE_SYSTEM_DOC_INCLUDES = +READLINE_INTREE_DOC_INCLUDES = $(READLINE_DIR)/rluser.texi $(READLINE_DIR)/hsuser.texi +READLINE_DOC_SOURCE_INCLUDES = @READLINE_DOC_SOURCE_INCLUDES@ + # Main GDB manual # Note that this unconditionally includes the readline texi files, # even when --with-system-readline is used. This is harmless because @@ -129,8 +134,7 @@ GDB_DOC_SOURCE_INCLUDES = \ $(srcdir)/fdl.texi \ $(srcdir)/gpl.texi \ $(srcdir)/agentexpr.texi \ - $(READLINE_DIR)/rluser.texi \ - $(READLINE_DIR)/hsuser.texi + $(READLINE_DOC_SOURCE_INCLUDES) GDB_DOC_BUILD_INCLUDES = \ gdb-cfg.texi \ GDBvn.texi |