From 84acd4c98908f2a54b20f07d3e18ff683708b7be Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 22 Aug 2009 17:08:06 +0000 Subject: [PATCH] Cleanups after the update to Autoconf 2.64, Automake 1.11. /: * README-maintainer-mode: Point directly to upstream locations for autoconf, automake, libtool, gettext, instead of copies on sources.redhat.com. Document required versions. * configure.ac: Do not substitute datarootdir, htmldir, pdfdir, docdir. Do not process --with-datarootdir, --with-htmldir, --with-pdfdir, --with-docdir. * configure: Regenerate. gdb/: * CONTRIBUTE: Bump documented Autoconf version. * configure.ac: Do not substitute datarootdir, htmldir, pdfdir, docdir. Do not process --with-datarootdir, --with-htmldir, --with-pdfdir, --with-docdir. * configure: Regenerate. gdb/doc/: * gdbint.texinfo (Releasing GDB): Point to README-maintainer-mode file for required autoconf version. * configure.ac: Do not substitute datarootdir, htmldir, pdfdir, docdir. Do not process --with-datarootdir, --with-htmldir, --with-pdfdir, --with-docdir. * configure: Regenerate. gprof/: * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (install-pdf-recursive, html__strip_dir, install-html) (install-html-am, install-html-recursive): Remove. * Makefile.in: Regenerate. opcodes/: * Makefile.am (install-pdf, install-html): Remove. * Makefile.in: Regenerate. gas/: * Makefile.am (install-pdf, install-pdf-recursive, install-html) (install-html-recursive): Remove. * Makefile.in: Regenerate. * doc/Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (html__strip_dir, install-html, install-html-am): Remove. * doc/Makefile.in: Regenerate. ld/: * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (install-pdf-recursive, html__strip_dir, install-html) (install-html-am, install-html-recursive): Remove. * Makefile.in: Regenerate. binutils/: * Makefile.am (install-pdf, install-pdf-recursive, install-html) (install-html-recursive): Remove. * Makefile.in: Regenerate. * doc/Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (html__strip_dir, install-html, install-html-am): Remove. * doc/Makefile.in: Regenerate. bfd/: * Makefile.am (datarootdir, docdir, htmldor, pdfdir) (install-pdf, install-pdf-recursive, install-html) (install-html-recursive): Remove. * Makefile.in: Regenerate. bfd/doc/: * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (html__strip_dir, install-html, install-html-am): Remove. * Makefile.in: Regenerate. --- ChangeLog | 8 +++++++ README-maintainer-mode | 13 ++++++++++- configure | 50 ------------------------------------------ configure.ac | 26 ---------------------- 4 files changed, 20 insertions(+), 77 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6b9504bf..e9e3a7639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-08-22 Ralf Wildenhues + * README-maintainer-mode: Point directly to upstream locations + for autoconf, automake, libtool, gettext, instead of copies on + sources.redhat.com. Document required versions. + * configure.ac: Do not substitute datarootdir, htmldir, + pdfdir, docdir. Do not process --with-datarootdir, + --with-htmldir, --with-pdfdir, --with-docdir. + * configure: Regenerate. + * configure: Regenerate. * compile: Sync from Automake 1.11. diff --git a/README-maintainer-mode b/README-maintainer-mode index 0115a1ee5..a350974a5 100644 --- a/README-maintainer-mode +++ b/README-maintainer-mode @@ -3,7 +3,18 @@ Note that if you configure with --enable-maintainer-mode, you will need special versions of automake, autoconf, libtool and gettext. You will -find the sources for these in ftp://sources.redhat.com/pub/binutils. +find the sources for these in the respective upstream directories: + + ftp://ftp.gnu.org/gnu/autoconf + ftp://ftp.gnu.org/gnu/automake + ftp://ftp.gnu.org/gnu/libtool + ftp://ftp.gnu.org/gnu/gettext + +The required versions of the tools for this tree are + autoconf 2.64 + automake 1.11 + libtool 2.2.6 + gettext 0.14.5 Note - "make distclean" does not work with maintainer mode enabled. The Makefiles in the some of the po/ subdirectories depend upon the diff --git a/configure b/configure index 715915c6a..0d149717b 100755 --- a/configure +++ b/configure @@ -770,10 +770,6 @@ with_build_time_tools enable_maintainer_mode enable_stage1_checking enable_werror -with_datarootdir -with_docdir -with_pdfdir -with_htmldir ' ac_precious_vars='build_alias host_alias @@ -1500,10 +1496,6 @@ Optional Packages: map A to B, C to D ... in debug information --with-build-time-tools=PATH use given path to find target tools during the build - --with-datarootdir use datarootdir as the data root directory. - --with-docdir install documentation in this directory. - --with-pdfdir install pdf in this directory. - --with-htmldir install html in this directory. Some influential environment variables: CC C compiler command @@ -13187,48 +13179,6 @@ case ${enable_werror} in esac -# Flags needed to enable html installing and building - -# Check whether --with-datarootdir was given. -if test "${with_datarootdir+set}" = set; then : - withval=$with_datarootdir; datarootdir="\${prefix}/${withval}" -else - datarootdir="\${prefix}/share" -fi - - - -# Check whether --with-docdir was given. -if test "${with_docdir+set}" = set; then : - withval=$with_docdir; docdir="\${prefix}/${withval}" -else - docdir="\${datarootdir}/doc" -fi - - - -# Check whether --with-pdfdir was given. -if test "${with_pdfdir+set}" = set; then : - withval=$with_pdfdir; pdfdir="\${prefix}/${withval}" -else - pdfdir="\${docdir}" -fi - - - -# Check whether --with-htmldir was given. -if test "${with_htmldir+set}" = set; then : - withval=$with_htmldir; htmldir="\${prefix}/${withval}" -else - htmldir="\${docdir}" -fi - - - - - - - # Specify what files to not compare during bootstrap. compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*" diff --git a/configure.ac b/configure.ac index 9da004896..ad2c86a5a 100644 --- a/configure.ac +++ b/configure.ac @@ -3120,32 +3120,6 @@ case ${enable_werror} in esac AC_SUBST(stage2_werror_flag) -# Flags needed to enable html installing and building -AC_ARG_WITH(datarootdir, -[ --with-datarootdir use datarootdir as the data root directory.], -[datarootdir="\${prefix}/${withval}"], -[datarootdir="\${prefix}/share"]) - -AC_ARG_WITH(docdir, -[ --with-docdir install documentation in this directory.], -[docdir="\${prefix}/${withval}"], -[docdir="\${datarootdir}/doc"]) - -AC_ARG_WITH(pdfdir, -[ --with-pdfdir install pdf in this directory.], -[pdfdir="\${prefix}/${withval}"], -[pdfdir="\${docdir}"]) - -AC_ARG_WITH(htmldir, -[ --with-htmldir install html in this directory.], -[htmldir="\${prefix}/${withval}"], -[htmldir="\${docdir}"]) - -AC_SUBST(datarootdir) -AC_SUBST(docdir) -AC_SUBST(pdfdir) -AC_SUBST(htmldir) - # Specify what files to not compare during bootstrap. compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"