From 84acd4c98908f2a54b20f07d3e18ff683708b7be Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 22 Aug 2009 17:08:06 +0000
Subject: 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.
---
 configure | 50 --------------------------------------------------
 1 file changed, 50 deletions(-)

(limited to 'configure')

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/*"
-- 
cgit v1.2.3