Index: gdb/doc/configure.ac =================================================================== RCS file: /cvs/src/src/gdb/doc/configure.ac,v retrieving revision 1.1 diff -U3 -r1.1 configure.ac --- gdb/doc/configure.ac 7 Jan 2005 21:53:22 -0000 1.1 +++ gdb/doc/configure.ac 6 Nov 2007 22:46:57 -0000 @@ -2,4 +2,13 @@ AC_INIT(refcard.tex) AC_PROG_INSTALL AC_PROG_LN_S + +AC_ARG_ENABLE(internal-docs, + [ --enable-internal-docs build and install internal documentation], + [if test "x$enable_internal_docs" = x; then + enable_internal_docs=yes + fi], + [enable_internal_docs=yes]) +AC_SUBST(enable_internal_docs) + AC_OUTPUT(Makefile) Index: gdb/doc/Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/doc/Makefile.in,v retrieving revision 1.39 diff -U3 -r1.39 Makefile.in --- gdb/doc/Makefile.in 26 Jul 2007 10:34:00 -0000 1.39 +++ gdb/doc/Makefile.in 6 Nov 2007 22:46:55 -0000 @@ -27,6 +27,8 @@ pdfdir = $(prefix)/share/doc/gdb htmldir = $(prefix)/html +enable_internal_docs = @enable_internal_docs@ + SHELL = @SHELL@ LN_S = @LN_S@ @@ -71,11 +73,20 @@ SET_TEXINPUTS = \ TEXINPUTS=${TEXIDIR}:.:$(srcdir):$(READLINE_DIR):$(GDBMI_DIR):$$TEXINPUTS -# Files which should be generated via 'info' and installed by 'install-info' -INFO_DEPS = gdb.info gdbint.info stabs.info annotate.info - -# Files which should be generated via 'pdf' and installed by 'install-pdf' -PDFFILES = gdb.pdf gdbint.pdf stabs.pdf refcard.pdf annotate.pdf +# Documentation files of various sorts. +INFO_DEPS = gdb.info +HTMLFILES = gdb_toc.html +DVIFILES = gdb.dvi refcard.dvi +PSFILES = gdb.ps refcard.ps +PDFFILES = gdb.pdf refcard.pdf + +ifeq ($(enable_internal_docs),yes) + INFO_DEPS += gdbint.info stabs.info annotate.info + HTMLFILES += gdbint_toc.html stabs_toc.html annotate_toc.html + DVIFILES += gdbint.dvi stabs.dvi annotate.dvi + PSFILES += gdbint.ps stabs.ps annotate.ps + PDFFILES += gdbint.pdf stabs.pdf annotate.pdf +endif # There may be alternate predefined collections of switches to configure # the GDB manual. Normally this is not done in synch with the software @@ -157,9 +168,9 @@ all: info: $(INFO_DEPS) -dvi: gdb.dvi gdbint.dvi stabs.dvi refcard.dvi annotate.dvi -ps: gdb.ps gdbint.ps stabs.ps refcard.ps annotate.ps -html: gdb_toc.html gdbint_toc.html stabs_toc.html annotate_toc.html +dvi: $(DVIFILES) +ps: $(PSFILES) +html: $(HTMLFILES) pdf: $(PDFFILES) all-doc: info dvi ps # pdf diststuff: info Index: etc/configure.in =================================================================== RCS file: /cvs/src/src/etc/configure.in,v retrieving revision 1.2 diff -U3 -r1.2 configure.in --- etc/configure.in 6 Apr 2006 21:49:30 -0000 1.2 +++ etc/configure.in 6 Nov 2007 22:46:35 -0000 @@ -8,5 +8,12 @@ AC_SUBST(docdir) AC_SUBST(htmldir) +AC_ARG_ENABLE(internal-docs, + [ --enable-internal-docs build and install internal documentation], + [if test "x$enable_internal_docs" = x; then + enable_internal_docs=yes + fi], + [enable_internal_docs=yes]) +AC_SUBST(enable_internal_docs) AC_OUTPUT(Makefile) Index: etc/Makefile.in =================================================================== RCS file: /cvs/src/src/etc/Makefile.in,v retrieving revision 1.7 diff -U3 -r1.7 Makefile.in --- etc/Makefile.in 27 Mar 2007 18:09:32 -0000 1.7 +++ etc/Makefile.in 6 Nov 2007 22:46:33 -0000 @@ -30,6 +30,7 @@ infodir = @infodir@ pdfdir = @docdir@ htmldir = @htmldir@ +enable_internal_docs = @enable_internal_docs@ SHELL = /bin/sh @@ -58,10 +59,12 @@ #### Host, target, and site specific Makefile fragments come in here. ### -INFOFILES = standards.info configure.info -DVIFILES = standards.dvi configure.dvi -PDFFILES = standards.pdf configure.pdf -HTMLFILES = standards.html configure.html +ifeq ($(enable_internal_docs),yes) + INFOFILES = standards.info configure.info + DVIFILES = standards.dvi configure.dvi + HTMLFILES = standards.html configure.html + PDFFILES = standards.pdf configure.pdf +endif all: info install: install-info @@ -80,19 +83,15 @@ done install-info: info - $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir) - if test ! -f standards.info; then cd $(srcdir); fi; \ - if test -f standards.info; then \ - for i in standards.info*; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \ - done; \ - fi - if test ! -f configure.info; then cd $(srcdir); fi; \ - if test -f configure.info; then \ - for i in configure.info*; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \ - done; \ + if test "x$(INFOFILES)" != x; then \ + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir); \ fi + for f in $(INFOFILES); do \ + if test ! -f $$f; then cd $(srcdir); fi; \ + if test -f $$f; then \ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$f; \ + fi; \ + done html: for f in $(HTMLFILES); do \ @@ -106,19 +105,15 @@ done install-html: html - $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(htmldir) - if test ! -f standards.html; then cd $(srcdir); fi; \ - if test -f standards.html; then \ - for i in standards.html*; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \ - done; \ - fi - if test ! -f configure.html; then cd $(srcdir); fi; \ - if test -f configure.html; then \ - for i in configure.html*; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \ - done; \ + if test "x$(HTMLFILES)" != x; then \ + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(htmldir); \ fi + for f in $(HTMLFILES); do \ + if test ! -f $$f; then cd $(srcdir); fi; \ + if test -f $$f; then \ + $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f; \ + fi; \ + done dvi: for f in $(DVIFILES); do \ @@ -143,19 +138,15 @@ done install-pdf: pdf - $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(pdfdir)/etc - if test ! -f standards.pdf; then cd $(srcdir); fi; \ - if test -f standards.pdf; then \ - for i in standards.pdf*; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(pdfdir)/etc/$$i; \ - done; \ - fi - if test ! -f configure.pdf; then cd $(srcdir); fi; \ - if test -f configure.pdf; then \ - for i in configure.pdf*; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(pdfdir)/etc/$$i; \ - done; \ + if test "x$(PDFFILES)" != x; then \ + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(pdfdir)/etc; \ fi + for f in $(PDFFILES); do \ + if test ! -f $$f; then cd $(srcdir); fi; \ + if test -f $$f; then \ + $(INSTALL_DATA) $$f $(DESTDIR)$(pdfdir)/etc/$$f; \ + fi; \ + done standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi $(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi Index: gdb/doc/configure =================================================================== RCS file: /cvs/src/src/gdb/doc/configure,v retrieving revision 1.3 diff -U3 -r1.3 configure --- gdb/doc/configure 7 Jan 2005 21:53:22 -0000 1.3 +++ gdb/doc/configure 6 Nov 2007 22:46:57 -0000 @@ -272,7 +272,7 @@ PACKAGE_BUGREPORT= ac_unique_file="refcard.tex" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S enable_internal_docs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -780,6 +780,11 @@ cat <<\_ACEOF +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-internal-docs build and install internal documentation + _ACEOF fi @@ -1330,6 +1335,18 @@ echo "${ECHO_T}no, using $LN_S" >&6 fi + +# Check whether --enable-internal-docs or --disable-internal-docs was given. +if test "${enable_internal_docs+set}" = set; then + enableval="$enable_internal_docs" + if test "x$enable_internal_docs" = x; then + enable_internal_docs=yes + fi +else + enable_internal_docs=yes +fi; + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -1970,6 +1987,7 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@LN_S@,$LN_S,;t t +s,@enable_internal_docs@,$enable_internal_docs,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF Index: etc/configure =================================================================== RCS file: /cvs/src/src/etc/configure,v retrieving revision 1.2 diff -U3 -r1.2 configure --- etc/configure 6 Apr 2006 21:49:30 -0000 1.2 +++ etc/configure 6 Nov 2007 22:46:35 -0000 @@ -272,7 +272,7 @@ PACKAGE_BUGREPORT= ac_unique_file="Makefile.in" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA datarootdir docdir htmldir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA datarootdir docdir htmldir enable_internal_docs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -780,6 +780,11 @@ cat <<\_ACEOF +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-internal-docs build and install internal documentation + _ACEOF fi @@ -1325,6 +1330,16 @@ +# Check whether --enable-internal-docs or --disable-internal-docs was given. +if test "${enable_internal_docs+set}" = set; then + enableval="$enable_internal_docs" + if test "x$enable_internal_docs" = x; then + enable_internal_docs=yes + fi +else + enable_internal_docs=yes +fi; + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -1968,6 +1983,7 @@ s,@datarootdir@,$datarootdir,;t t s,@docdir@,$docdir,;t t s,@htmldir@,$htmldir,;t t +s,@enable_internal_docs@,$enable_internal_docs,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF