Moving to Autoconf 2.64, Automake 1.11

classic Classic list List threaded Threaded
33 messages Options
12
Reply | Threaded
Open this post in threaded view
|

Moving to Autoconf 2.64, Automake 1.11

Ralf Wildenhues
Hello everyone,

I will reply to this message with a number of patches that contain the
heart of the switch to newer autotools.  They apply in the order posted,
and each successive version is expected to work, or at least only break
minor bits such as provoking an automake warning about duplicate
install-pdf, but my plan is to get them all approved and then apply them
in short succession.  (Splitting them by topic is really helpful to
maintain sanity, and be able to distinguish generated from manual
changes.) For committing the series, would it be ok to then ask for a
couple of hours in which no changes to the build system are made?


- Update automake-provided helper scripts in the toplevel,
- LIBTOOLFLAGS, and *_LINK fixes for Automake 1.11 (GCC only),
- some minor fixes in sim, gold, gdb (src only)
- Bump Autoconf version to 2.64 in override.m4, and regenerate the
  world with 2.64 and Automake 1.11,
- remove {all,install}-{html,pdf} and {dataroot,doc,pdf,html}dir stuff
  not needed any more, update documentation bits throughout the tree.

Apart from that, I would need somebody to update the autotools tarballs
at ftp://sources.redhat.com/pub/binutils for me, at the time I am
committing the above.  The upstream tarballs are available here:
  ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.64.tar.gz
  ftp://ftp.gnu.org/gnu/automake/automake-1.11.tar.gz


I have done a bunch of testing of the resulting trees, mostly native
bootstraps+regtests however (no regressions).  I think I have addressed
all issues that cropped up and that have been documented before on this
list.  Notably, however, I have not done a --with-build-sysroot test; I
would like to ask someone else to do this for me.  I do have good reason
to believe that the issue reportd in
<http://gcc.gnu.org/ml/gcc-patches/2008-01/msg00912.html> is fixed in
my patch series, though: the very likely reason for the above was that
the *_LDFLAGS/*_LINK semantic change was not addressed.

The texinfo changes have been tested with 'make info pdf html'.

To make it easy for whoever volunteers for the --with-build-sysroot
test, I would like to ask for this to be done after I commit the patch
set.  OK?

Note that I do expect one or two more things that could break some
specific build setups; I don't think it is feasible to test them all in
advance, but I will try to look at them in a short order then.

This patch series can be extended with two more helpful changes that
are not time-critical:

- bump all the AC_PREREQ's to 2.64, add 1.11 to AUTOMAKE_OPTIONS or
  AM_INIT_AUTOMAKE calls as requirement, to avoid accidental use of old
  tools.  The config/override.m4 bit ought to prevent the error for
  Autoconf already, unless other weird issues come into play, too, such
  as also inadvertently dropping some aclocal -I ../config options or
  so.  (My thinking here was that, as some parts of the tree are shared
  with external projects, they don't need to upgrade their autotools
  usage right at the same time.)

- fix the (new with Autoconf 2.64) warnings from configure about unknown
  --enable/--with switches.  I would appreciate some input on whether
  this functionality should just be turned off with
  AC_DISABLE_OPTION_CHECKING, or we should add some logic to the
  toplevel configure script to be more intelligent about it.


Thanks for all the review work done so far!
Ralf
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/N] Update automake-provided files in the toplevel

Ralf Wildenhues
> - Update automake-provided files in the toplevel,

This patch is just FYI, as technically, I don't need permission to
update these helper files.

Cheers,
Ralf

ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * compile: Sync from Automake 1.11.
        * depcomp: Likewise.
        * install-sh: Likewise.
        * missing: Likewise.

diff --git a/compile b/compile
index 1b1d232..ec64c62 100644
--- a/compile
+++ b/compile
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2005-05-14.22
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
 # Written by Tom Tromey <[hidden email]>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
 fi
 
 # Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
 while true; do
   if mkdir "$lockdir" >/dev/null 2>&1; then
     break
@@ -138,5 +138,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/depcomp b/depcomp
index 3510ab0..df8eea7 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-05-16.16
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,9 +17,7 @@ scriptversion=2005-05-16.16
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -86,12 +85,34 @@ if test "$depmode" = dashXmstdout; then
    depmode=dashmstdout
 fi
 
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -178,14 +199,14 @@ sgi)
 ' < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
     tr '
-' ' ' >> $depfile
-    echo >> $depfile
+' ' ' >> "$depfile"
+    echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
     tr ' ' '
 ' < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+   >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -201,34 +222,39 @@ aix)
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -276,27 +302,49 @@ icc)
   rm -f "$tmpdepfile"
   ;;
 
-ia64hp)
-  # The "hp" stanza above does not work with HP's ia64 compilers,
-  # which have integrated preprocessors.  The correct option to use
-  # with these is +Maked; it writes dependencies to a file named
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
-  tmpdepfile=`echo "$object" | sed -e 's/\.o$/.d/'`
-  "$@" +Maked
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
   stat=$?
   if test $stat -eq 0; then :
   else
-     rm -f "$tmpdepfile"
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
-  rm -f "$depfile"
 
-  # The object file name is correct already.
-  cat "$tmpdepfile" > "$depfile"
-  # Add `dependent.h:' lines.
-  sed -ne '2,${; s/^ //; s/ \\*$//; s/$/:/; p; }' "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${
+       s/^ *//
+       s/ \\*$//
+       s/$/:/
+       p
+     }' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
@@ -311,13 +359,13 @@ tru64)
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
@@ -368,7 +416,7 @@ dashmstdout)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -419,32 +467,39 @@ makedepend)
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  cleared=no eat=no
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
@@ -464,7 +519,7 @@ cpp)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -502,13 +557,27 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # always write the preprocessed file to stdout.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
  set fnord "$@"
  shift
@@ -521,16 +590,23 @@ msvisualcpp)
  ;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
   echo " " >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -549,5 +625,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/install-sh b/install-sh
index 4d4a951..6781b98 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@ scriptversion=2005-05-14.22
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" "" $nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
 
-chmodcmd="$chmodprog 0755"
-chowncmd=
 chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+ shift;;
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
+    -m) mode=$2
+ case $mode in
+  *' '* | *' '* | *'
+'*  | *'*'* | *'?'* | *'['*)
+    echo "$0: invalid mode: $mode" >&2
+    exit 1;;
+ esac
+ shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+ shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
- shift
- shift
- continue;;
+    -t) dst_arg=$2
+ shift;;
 
-    -T) no_target_directory=true
- shift
- continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
- for arg
- do
-          if test -n "$dstarg"; then
-    # $@ is not empty: it contains at least $arg.
-    set fnord "$@" "$dstarg"
-    shift # fnord
-  fi
-  shift # arg
-  dstarg=$arg
- done
+    --) shift
  break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,24 +199,47 @@ if test -z "$1"; then
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+ u_plus_rw=
+      else
+ u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+ u_plus_rw=
+      else
+ u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
  exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+     X"$dst" : 'X\(//\)[^/]' \| \
+     X"$dst" : 'X\(//\)$' \| \
+     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+   s//\1/
+   q
+ }
+ /^X\(\/\/\)[^/].*/{
+   s//\1/
+   q
+ }
+ /^X\(\/\/\)$/{
+   s//\1/
+   q
+ }
+ /^X\(\/\).*/{
+   s//\1/
+   q
+ }
+ s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+  # Optimize common cases.
+  *[2367][2367]) mkdir_umask=$umask;;
+  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+  *[0-7])
+    mkdir_umask=`expr $umask + 22 \
+      - $umask % 100 % 40 + $umask % 20 \
+      - $umask % 10 % 4 + $umask % 2
+    `;;
+  *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+  mkdir_mode=-m$mode
+ else
+  mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+  *[123567][0-7][0-7])
+    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+    ;;
+  *)
+    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+    if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+    then
+      if test -z "$dir_arg" || {
+   # Check for POSIX incompatibilities with -m.
+   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+   # other-writeable bit of parent directory when it shouldn't.
+   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+   case $ls_ld_tmpdir in
+     d????-?r-*) different_mode=700;;
+     d????-?--*) different_mode=755;;
+     *) false;;
+   esac &&
+   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+   }
+ }
+      then posix_mkdir=:
+      fi
+      rmdir "$tmpdir/d" "$tmpdir"
+    else
+      # Remove any dirs left behind by ancient mkdir implementations.
+      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+    fi
+    trap '' 0;;
+ esac;;
+    esac
 
-  # Make sure that the destination directory exists.
+    if
+      $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
- '
-    IFS="${IFS-$defaultIFS}"
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
 
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+      case $dstdir in
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *)  prefix='';;
+      esac
 
-    pathcomp=
+      eval "$initialize_posix_glob"
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently.  This
- # is OK.
- test -d "$pathcomp" || exit
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+  prefixes=
+ else
+  if $posix_mkdir; then
+    (umask=$mkdir_umask &&
+     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+    # Don't fail if two instances are running concurrently.
+    test -d "$prefix" || exit 1
+  else
+    case $prefix in
+      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) qprefix=$prefix;;
+    esac
+    prefixes="$prefixes '$qprefix'"
+  fi
+ fi
+ prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+  test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@ do
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -273,51 +458,63 @@ do
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-   # The rename failed, perhaps because mv can't rename something else
-   # to itself, or perhaps because mv is so ancient that it does not
-   # support -f.
-
-   # Now remove or move aside any old file at destination location.
-   # We try this two ways since rm can't unlink itself on some
-   # systems and the destination file might be busy for other
-   # reasons.  In this case, the final cleanup might fail but the new
-   # file should still install successfully.
-   {
-     if test -f "$dstdir/$dstfile"; then
-       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-       || {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit 1
-       }
-     else
-       :
-     fi
-   } &&
-
-   # Now rename the file to the real destination.
-   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- }
-    }
-  fi || { (exit 1); exit 1; }
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons.  In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+  test ! -f "$dst" ||
+  $doit $rmcmd -f "$dst" 2>/dev/null ||
+  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+  } ||
+  { echo "$0: cannot unlink or rename $dst" >&2
+    (exit 1); exit 1
+  }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
 done
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/missing b/missing
index 894e786..28055d2 100755
--- a/missing
+++ b/missing
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <[hidden email]>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@ scriptversion=2005-06-08.21
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@ if test $# -eq 0; then
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +44,7 @@ fi
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +77,7 @@ Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@ Supported PROGRAM values:
   tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
 Send bug reports to <[hidden email]>."
     exit $?
     ;;
@@ -103,15 +107,22 @@ Send bug reports to <[hidden email]>."
 
 esac
 
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar)
+  tar*)
     if test -n "$run"; then
        echo 1>&2 "ERROR: \`tar' requires --run"
        exit 1
@@ -135,7 +146,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $program in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -145,7 +156,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch aclocal.m4
     ;;
 
-  autoconf)
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -154,7 +165,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch configure
     ;;
 
-  autoheader)
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -164,7 +175,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
        sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@ WARNING: \`$1' is $msg.  You should only need it if
    while read f; do touch "$f"; done
     ;;
 
-  autom4te)
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -192,8 +203,8 @@ WARNING: \`$1' is needed, but is $msg.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
  touch $file
     else
@@ -207,80 +218,78 @@ WARNING: \`$1' is needed, but is $msg.
     fi
     ;;
 
-  bison|yacc)
+  bison*|yacc*)
     echo 1>&2 "\
 WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
  *.y)
     SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-    if [ -f "$SRCFILE" ]; then
+    if test -f "$SRCFILE"; then
          cp "$SRCFILE" y.tab.c
     fi
     SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-    if [ -f "$SRCFILE" ]; then
+    if test -f "$SRCFILE"; then
          cp "$SRCFILE" y.tab.h
     fi
   ;;
  esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
  echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
  echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
 
-  lex|flex)
+  lex*|flex*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
  *.l)
     SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-    if [ -f "$SRCFILE" ]; then
+    if test -f "$SRCFILE"; then
          cp "$SRCFILE" lex.yy.c
     fi
   ;;
  esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
  echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
 
-  help2man)
+  help2man*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
  you modified a dependency of a manual page.  You may need the
  \`Help2man' package in order for those modifications to take
  effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
  touch $file
     else
  test -z "$file" || exec >$file
  echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
     fi
     ;;
 
-  makeinfo)
+  makeinfo*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@ WARNING: \`$1' is $msg.  You should only need it if
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+ /^@setfilename/{
+  s/.* \([^ ]*\) *$/\1/
+  p
+  q
+ }' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -303,7 +318,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $file
     ;;
 
-  tar)
+  tar*)
     shift
 
     # We have already tried tar in the generic part.
@@ -317,13 +332,13 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     firstarg="$1"
     if shift; then
- case "$firstarg" in
+ case $firstarg in
  *o*)
     firstarg=`echo "$firstarg" | sed s/o//`
     tar "$firstarg" "$@" && exit 0
     ;;
  esac
- case "$firstarg" in
+ case $firstarg in
  *h*)
     firstarg=`echo "$firstarg" | sed s/h//`
     tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
Reply | Threaded
Open this post in threaded view
|

[PATCH 3/N] some minor fixes in sim, gold, gdb

Ralf Wildenhues
In reply to this post by Ralf Wildenhues
> - some minor fixes in sim, gold, gdb (src only)

These are:

- use the 'foreign' Automake option for gold.  Currently, gold
  is updated with "automake --foreign" manually, this just avoids
  the need to remember that option.

- gdb: replace obsolete macros with AC_USE_SYSTEM_EXTENSIONS.
  This change needs to come at the same time as the Autoconf update,
  as it assumes newer Autoconf semantics to properly replace the
  other macros.

- sim/common/aclocal.m4: SIM_CHECK_MEMBER is alias for AC_CHECK_MEMBER now.
  This also needs to happen at the same time as the Autoconf update, to
  avoid exposing whatever bugs 2.59's AC_CHECK_MEMBER had.
  Is this ok or would you rather I replace every use of SIM_CHECK_MEMBER
  with AC_CHECK_MEMBER?

Thanks,
Ralf

gold/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.am (AUTOMAKE_OPTIONS): Add foreign.

gdb/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure.ac: Use AC_USE_SYSTEM_EXTENSIONS instead of
        AC_GNU_SOURCE, AC_AIX, AC_ISC_POSIX.

sim/common/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4 (SIM_CHECK_MEMBER): Replace definition with
        definition of AC_CHECK_MEMBER.

diff --git a/gold/Makefile.am b/gold/Makefile.am
index 14173c1..448a3b8 100644
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -1,6 +1,6 @@
 # Process this file with automake to generate Makefile.in
 
-AUTOMAKE_OPTIONS =
+AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = po testsuite
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 77f8436..9dc736c 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -26,9 +26,7 @@ AC_CONFIG_HEADER(config.h:config.in)
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
-AC_GNU_SOURCE
-AC_AIX
-AC_ISC_POSIX
+AC_USE_SYSTEM_EXTENSIONS
 gl_EARLY
 AM_PROG_CC_STDC
 
diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4
index e8fd147..25ed460 100644
--- a/sim/common/aclocal.m4
+++ b/sim/common/aclocal.m4
@@ -942,28 +942,7 @@ dnl
 dnl  ---------------------------------------------------------
 dnl  AGGREGATE.MEMBER is for instance `struct passwd.pw_gecos', shell
 dnl  variables are not a valid argument.
-AC_DEFUN([SIM_CHECK_MEMBER],
-dnl Extract the aggregate name, and the member name
-[AC_CACHE_CHECK([for $1], [ac_]patsubst([$1], [[\. ]], [_]),
-[ac_]patsubst([$1], [[\. ]], [_])[=no;]
-AC_TRY_COMPILE([$4],[
-dnl AGGREGATE ac_aggr;
-static ]patsubst([$1], [\..*])[ ac_aggr;
-dnl ac_aggr.MEMBER;
-if (ac_aggr.]patsubst([$1], [^[^.]*\.])[)
-return 0;],[ac_]patsubst([$1], [[\. ]], [_])[=yes;],
-AC_TRY_COMPILE([$4],[
-dnl AGGREGATE ac_aggr;
-static ]patsubst([$1], [\..*])[ ac_aggr;
-dnl ac_aggr.MEMBER;
-if (sizeof ac_aggr.]patsubst([$1], [^[^.]*\.])[)
-return 0;],
-[ac_]patsubst([$1], [[\. ]], [_])[=yes;],
-[ac_]patsubst([$1], [[\. ]], [_])[=no;]))
-[if test [$]ac_]patsubst([$1], [[\. ]], [_])[ = yes; then :; [$2]
-else :; [$3]
-fi])
-])dnl SIM_CHECK_MEMBER
+AC_DEFUN([SIM_CHECK_MEMBER], defn([AC_CHECK_MEMBER]))
 dnl
 dnl Translated from a FC2 autoconf-2.59-3 installation.
 dnl  SIM_CHECK_MEMBERS([AGGREGATE.MEMBER, ...])
Reply | Threaded
Open this post in threaded view
|

[PATCH 4/N] The big bump

Ralf Wildenhues
In reply to this post by Ralf Wildenhues
> - Bump Autoconf version to 2.64 in override.m4, and regenerate the
>   world with 2.64 and Automake 1.11,

OK?

Thanks,
Ralf

The patch is really small (if you omit the generated files) ...

diff --git a/config/override.m4 b/config/override.m4
index bf112db..903bb9a 100644
--- a/config/override.m4
+++ b/config/override.m4
@@ -40,7 +40,7 @@ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
 
 dnl Ensure exactly this Autoconf version is used
 m4_ifndef([_GCC_AUTOCONF_VERSION],
-  [m4_define([_GCC_AUTOCONF_VERSION], [2.59])])
+  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
 
 dnl Test for the exact version when AC_INIT is expanded.
 dnl This allows to update the tree in steps (for testing)


... but the accompanying ChangeLog entries are rather not  :-)
(and the generated files diffs weigh a few MB):

GCC:

config/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * override.m4 (_GCC_AUTOCONF_VERSION): Bump to 2.64.

ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

intl/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4: Regenerate.
        * configure: Regenerate.

libiberty/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Regenerate.

boehm-gc/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * configure: Regenerate.
        * include/Makefile.in: Regenerate.
        * include/gc_config.h.in: Regenerate.

fixincludes/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4: Regenerate.
        * configure: Regenerate.

gcc/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4: Regenerate.
        * config.in: Regenerate.
        * configure: Regenerate.

libgcc/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

gnattools/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

libada/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

libcpp/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4: Regenerate.
        * config.in: Regenerate.
        * configure: Regenerate.

libdecnumber/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4: Regenerate.
        * configure: Regenerate.

libffi/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * configure: Regenerate.
        * fficonfig.h.in: Regenerate.
        * include/Makefile.in: Regenerate.
        * man/Makefile.in: Regenerate.
        * testsuite/Makefile.in: Regenerate.

libgfortran/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * config.h.in: Regenerate.
        * configure: Regenerate.

libgomp/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * config.h.in: Regenerate.
        * configure: Regenerate.
        * testsuite/Makefile.in: Regenerate.

libjava/classpath/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * configure: Regenerate.
        * doc/Makefile.in: Regenerate.
        * doc/api/Makefile.in: Regenerate.
        * examples/Makefile.in: Regenerate.
        * external/Makefile.in: Regenerate.
        * external/jsr166/Makefile.in: Regenerate.
        * external/relaxngDatatype/Makefile.in: Regenerate.
        * external/sax/Makefile.in: Regenerate.
        * external/w3c_dom/Makefile.in: Regenerate.
        * include/Makefile.in: Regenerate.
        * include/config.h.in: Regenerate.
        * lib/Makefile.in: Regenerate.
        * native/Makefile.in: Regenerate.
        * native/fdlibm/Makefile.in: Regenerate.
        * native/jawt/Makefile.in: Regenerate.
        * native/jni/Makefile.in: Regenerate.
        * native/jni/classpath/Makefile.in: Regenerate.
        * native/jni/gconf-peer/Makefile.in: Regenerate.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * native/jni/gtk-peer/Makefile.in: Regenerate.
        * native/jni/java-io/Makefile.in: Regenerate.
        * native/jni/java-lang/Makefile.in: Regenerate.
        * native/jni/java-math/Makefile.in: Regenerate.
        * native/jni/java-net/Makefile.in: Regenerate.
        * native/jni/java-nio/Makefile.in: Regenerate.
        * native/jni/java-util/Makefile.in: Regenerate.
        * native/jni/midi-alsa/Makefile.in: Regenerate.
        * native/jni/midi-dssi/Makefile.in: Regenerate.
        * native/jni/native-lib/Makefile.in: Regenerate.
        * native/jni/qt-peer/Makefile.in: Regenerate.
        * native/jni/xmlj/Makefile.in: Regenerate.
        * native/plugin/Makefile.in: Regenerate.
        * resource/Makefile.in: Regenerate.
        * scripts/Makefile.in: Regenerate.
        * tools/Makefile.in: Regenerate.

libjava/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * configure: Regenerate.
        * gcj/Makefile.in: Regenerate.
        * include/Makefile.in: Regenerate.
        * include/config.h.in: Regenerate.
        * testsuite/Makefile.in: Regenerate.

libjava/libltdl/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * config-h.in: Regenerate.
        * configure: Regenerate.

libmudflap/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * config.h.in: Regenerate.
        * configure: Regenerate.
        * testsuite/Makefile.in: Regenerate.

libobjc/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4: Regenerate.
        * configure: Regenerate.
        * config.h.in: Regenerate.

libssp/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * config.h.in: Regenerate.
        * configure: Regenerate.

libstdc++-v3/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * acinclude.m4: Regenerate.
        * aclocal.m4: Regenerate.
        * config.h.in: Regenerate.
        * configure: Regenerate.
        * doc/Makefile.in: Regenerate.
        * include/Makefile.in: Regenerate.
        * libsupc++/Makefile.in: Regenerate.
        * po/Makefile.in: Regenerate.
        * python/Makefile.in: Regenerate.
        * src/Makefile.in: Regenerate.
        * testsuite/Makefile.in: Regenerate.

zlib/ChangeLog: Regenerate.
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * configure: Regenerate.


--- snip ---

src:

config/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * override.m4 (_GCC_AUTOCONF_VERSION): Bump to 2.64.

intl/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4: Regenerate.
        * config.h.in: Likewise.
        * configure: Likewise.

libdecnumber/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4: Regenerate.
        * config.in: Likewise.
        * configure: Likewise.

etc/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

sim/common/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/iq2000/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/d10v/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/igen/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/m32r/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/frv/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * avr/config.in: Regenerate.
        * avr/configure: Likewise.
        * configure: Likewise.
        * cris/config.in: Likewise.
        * cris/configure: Likewise.

sim/h8300/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/mn10300/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/ppc/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/erc32/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/arm/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/m68hc11/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/lm32/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/sh64/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/v850/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/cr16/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/moxie/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/m32c/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/mips/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/mcore/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

sim/testsuite/d10v-elf/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

sim/testsuite/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

sim/testsuite/frv-elf/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

sim/testsuite/m32r-elf/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

sim/testsuite/mips64el-elf/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

sim/sh/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

gold/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Likewise.
        * config.in: Likewise.
        * configure: Likewise.
        * testsuite/Makefile.in: Likewise.

gprof/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4
        * configure: Likewise.
        * gconfig.in: Likewise.

libiberty/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * config.in: Regenerate.
        * configure: Likewise.

ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

opcodes/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Likewise.
        * config.in: Likewise.
        * configure: Likewise.

readline/examples/rlfe/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

gas/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Likewise.
        * config.in: Likewise.
        * configure: Likewise.
        * doc/Makefile.in: Likewise.

ld/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4
        * config.in: Likewise.
        * configure: Likewise.

gdb/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4  Regenerate.
        * config.in: Likewise.
        * configure: Likewise.
        * gnulib/Makefile.in: Likewise.

gdb/doc/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.

gdb/gdbserver/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * aclocal.m4: Regenerate.
        * config.in: Likewise.
        * configure: Likewise.

gdb/testsuite/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.
        * gdb.hp/configure: Likewise.
        * gdb.hp/gdb.aCC/configure: Likewise.
        * gdb.hp/gdb.base-hp/configure: Likewise.
        * gdb.hp/gdb.compat/configure: Likewise.
        * gdb.hp/gdb.defects/configure: Likewise.
        * gdb.hp/gdb.objdbg/configure: Likewise.
        * gdb.stabs/configure: Likewise.

binutils/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Likewise.
        * config.in: Likewise.
        * configure: Likewise.
        * doc/Makefile.in: Likewise.

bfd/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.
        * aclocal.m4: Likewise.
        * config.in: Likewise.
        * configure: Likewise.

bfd/doc/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.in: Regenerate.

readline/ChangeLog.gdb:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure: Regenerate.
Reply | Threaded
Open this post in threaded view
|

Re: Moving to Autoconf 2.64, Automake 1.11

Gerald Pfeifer
In reply to this post by Ralf Wildenhues
On Sat, 15 Aug 2009, Ralf Wildenhues wrote:
> Apart from that, I would need somebody to update the autotools tarballs
> at ftp://sources.redhat.com/pub/binutils for me, at the time I am
> committing the above.  The upstream tarballs are available here:
>   ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.64.tar.gz
>   ftp://ftp.gnu.org/gnu/automake/automake-1.11.tar.gz

Looking at the dates of the original tarballs (which look like snapshots
needed at that point in time), I am wondering why we shouldn't just refer
to the vanilla upstream versions and downloads?

Gerald
Reply | Threaded
Open this post in threaded view
|

[PATCH 5/N] post-update cleanups

Ralf Wildenhues
In reply to this post by Ralf Wildenhues
> - remove {all,install}-{html,pdf} and {dataroot,doc,pdf,html}dir stuff
>   not needed any more, update documentation bits throughout the tree.

This patch fixes fallout from rules that are not needed any more with
newer autotools.

OK for the GCC, binutils, and gdb parts?

Tom, could you submit the classpath change upstream, please?

Does http://gcc.gnu.org/install/prerequisites.html get rebuilt
automatically?

Thanks,
Ralf

GCC:
ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure.ac: Remove --with-datarootdir, --with-docdir,
        --with-pdfdir, --with-htmldir switches.
        * configure: Regenerate.

gcc/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure.ac: Remove --with-datarootdir, --with-docdir,
        --with-htmldir switches.  No need to call AC_SUBST for
        datarootdir, docdir, htmldir any more.
        * configure: Regenerate.
        * doc/install.texi (Configuration): Document --datarootdir,
        --docdir, --htmldir, --pdfdir; update documentation for
        --infodir, --mandir.
        (Prerequisites): Bump Autoconf version to 2.64, Automake to
        1.11, M4 to 1.4.6.

libgfortran/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.am (install-html, install-pdf): Remove.

libjava/classpath/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * doc/cp-hacking.texinfo (Needed Tools and Libraries): Bump
        Autoconf version to 2.64, Automake to 1.11, M4 to 1.4.6.

libjava/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * HACKING: Use aclocal-1.11 and autoconf-2.64 in example.

libstdc++-v3/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * doc/xml/manual/build_hacking.xml: Use tools from Autoconf
        2.64 and Automake 1.11 in examples; update link to Autoconf
        manual page about quadrigraphs.

diff --git a/configure.ac b/configure.ac
index 22cd976..68ac6b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3106,32 +3106,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/*"
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 267de5a..6f33612 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -819,11 +819,6 @@ AC_ARG_ENABLE(languages,
 esac],
 [enable_languages=c])
 
-# Used by documentation targets
-AC_SUBST(datarootdir)
-AC_SUBST(docdir)
-AC_SUBST(htmldir)
-
 AC_ARG_WITH(multilib-list,
 [  --with-multilib-list    Select multilibs (SH only)],
 :,
@@ -4003,24 +3998,6 @@ else
 fi)
 AC_SUBST(slibdir)
 
-AC_ARG_WITH(datarootdir,
-[  --with-datarootdir=DIR  Use DIR as the data root [[PREFIX/share]]],
-datarootdir="\${prefix}/$with_datarootdir",
-datarootdir='$(prefix)/share')
-AC_SUBST(datarootdir)
-
-AC_ARG_WITH(docdir,
-[  --with-docdir=DIR       Install documentation in DIR [[DATAROOTDIR]]],
-docdir="\${prefix}/$with_docdir",
-docdir='$(datarootdir)')
-AC_SUBST(docdir)
-
-AC_ARG_WITH(htmldir,
-[  --with-htmldir=DIR      html documentation in in DIR [[DOCDIR]]],
-htmldir="\${prefix}/$with_htmldir",
-htmldir='$(docdir)')
-AC_SUBST(htmldir)
-
 # Substitute configuration variables
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index a480dc5..b9043b2 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -714,18 +714,34 @@ The default is @file{@var{exec-prefix}/libexec}.
 Specify the installation directory for the shared libgcc library.  The
 default is @file{@var{libdir}}.
 
+@item --datarootdir=@var{dirname}
+Specify the root of the directory tree for read-only architecture-independent
+data files referenced by GCC@.  The default is @file{@var{prefix}/share}.
+
 @item --infodir=@var{dirname}
 Specify the installation directory for documentation in info format.
-The default is @file{@var{prefix}/info}.
+The default is @file{@var{datarootdir}/info}.
 
 @item --datadir=@var{dirname}
 Specify the installation directory for some architecture-independent
-data files referenced by GCC@.  The default is @file{@var{prefix}/share}.
+data files referenced by GCC@.  The default is @file{@var{datarootdir}}.
+
+@item --docdir=@var{dirname}
+Specify the installation directory for documentation files (other
+than Info) for GCC@.  The default is @file{@var{datarootdir}/doc}.
+
+@item --htmldir=@var{dirname}
+Specify the installation directory for HTML documentation files.
+The default is @file{@var{docdir}}.
+
+@item --pdfdir=@var{dirname}
+Specify the installation directory for PDF documentation files.
+The default is @file{@var{docdir}}.
 
 @item --mandir=@var{dirname}
 Specify the installation directory for manual pages.  The default is
-@file{@var{prefix}/man}.  (Note that the manual pages are only extracts from
-the full GCC manuals, which are provided in Texinfo format.  The manpages
+@file{@var{datarootdir}/man}.  (Note that the manual pages are only extracts
+from the full GCC manuals, which are provided in Texinfo format.  The manpages
 are derived by an automatic conversion process from parts of the full
 manual.)
 
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 83634ff..d1fa32c 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -719,11 +719,6 @@ $(gfor_misc_specifics) \
 intrinsics/dprod_r8.f90 \
 intrinsics/f2c_specifics.F90
 
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
 # Turn on vectorization and loop unrolling for matmul.
 $(patsubst %.c,%.lo,$(notdir $(i_matmul_c))): AM_CFLAGS += -ftree-vectorize -funroll-loops
 # Logical matmul doesn't vectorize.
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index b9043b2..e3afa15 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -360,13 +360,13 @@ together with GCC@.
 
 @heading Tools/packages necessary for modifying GCC
 @table @asis
-@item autoconf version 2.59
-@itemx GNU m4 version 1.4 (or later)
+@item autoconf version 2.64
+@itemx GNU m4 version 1.4.6 (or later)
 
 Necessary when modifying @file{configure.ac}, @file{aclocal.m4}, etc.@:
 to regenerate @file{configure} and @file{config.in} files.
 
-@item automake version 1.9.6
+@item automake version 1.11
 
 Necessary when modifying a @file{Makefile.am} file to regenerate its
 associated @file{Makefile.in}.
@@ -377,8 +377,8 @@ file.  Specifically this applies to the @file{gcc}, @file{intl},
 as any of their subdirectories.
 
 For directories that use automake, GCC requires the latest release in
-the 1.9.x series, which is currently 1.9.6.  When regenerating a directory
-to a newer version, please update all the directories using an older 1.9.x
+the 1.11 series, which is currently 1.11.  When regenerating a directory
+to a newer version, please update all the directories using an older 1.11
 to the latest released version.
 
 @item gettext version 0.14.5 (or later)
diff --git a/libjava/HACKING b/libjava/HACKING
index ba85b69..fa38027 100644
--- a/libjava/HACKING
+++ b/libjava/HACKING
@@ -41,9 +41,9 @@ this can be done using these commands:
    cd libjava &&
    rm -f aclocal.m4 &&
    ACFLAGS=$(grep "^ACLOCAL_AMFLAGS" Makefile.in | sed -e "s/ACLOCAL_AMFLAGS[ \t ]*=//") &&
-   aclocal-1.9 $ACFLAGS &&
+   aclocal-1.11 $ACFLAGS &&
    rm -f configure &&
-   autoconf-2.59 &&
+   autoconf-2.64 &&
    rm -fr autom4te.cache
 
 See the GCC documentation which auto* versions to use.
@@ -91,7 +91,7 @@ To import a new release:
     in the classpath/ChangeLog.gcj file.
    (Don't forget to svn resolved files.)
 - Use auto* to create configure, Makefile.in, etc
-  Make sure you have Automake 1.9.6 installed. Exactly that version!
+  Make sure you have Automake 1.11 installed. Exactly that version!
   You have to make sure to use the gcc libtool.m4 and gcc lt* scripts
   cd .../classpath
   cp ../../lt* .
diff --git a/libjava/classpath/doc/cp-hacking.texinfo b/libjava/classpath/doc/cp-hacking.texinfo
index 829b0e4..a424b56 100644
--- a/libjava/classpath/doc/cp-hacking.texinfo
+++ b/libjava/classpath/doc/cp-hacking.texinfo
@@ -351,13 +351,13 @@ Eclipse Compiler for Java 3.1+
 @item
 CVS 1.11+
 @item
-automake 1.9+
+automake 1.11+
 @item
-autoconf 2.59+
+autoconf 2.64+
 @item
 libtool 1.5+
 @item
-GNU m4 1.4
+GNU m4 1.4.6
 @item
 texinfo 4.2+
 @end itemize
diff --git a/libstdc++-v3/doc/xml/manual/build_hacking.xml b/libstdc++-v3/doc/xml/manual/build_hacking.xml
index e5ca0cb..bfec860 100644
--- a/libstdc++-v3/doc/xml/manual/build_hacking.xml
+++ b/libstdc++-v3/doc/xml/manual/build_hacking.xml
@@ -58,8 +58,8 @@
     Regenerate all generated files by using the command sequence
     <code>"autoreconf"</code> at the top level of the libstdc++ source
     directory. The following will also work, but is much more complex:
-    <code>"aclocal-1.7 &amp;&amp; autoconf-2.59 &amp;&amp;
-    autoheader-2.59 &amp;&amp; automake-1.7"</code> The version
+    <code>"aclocal-1.11 &amp;&amp; autoconf-2.64 &amp;&amp;
+    autoheader-2.64 &amp;&amp; automake-1.11"</code> The version
     numbers may be absent entirely or otherwise vary depending on
     <ulink url="http://gcc.gnu.org/install/prerequisites.html">the
     current requirements</ulink> and your vendor's choice of
@@ -305,7 +305,7 @@
      If you're wondering what that line noise in the last example was,
      that's how you embed autoconf special characters in output text.
      They're called <ulink
-     url="http://ftp.gnu.org/pub/old-gnu/Manuals/autoconf-2.57/html_mono/autoconf.html#SEC95"><emphasis>quadrigraphs</emphasis></ulink>
+       url="http://www.gnu.org/software/autoconf/manual/autoconf.html#Quadrigraphs"><emphasis>quadrigraphs</emphasis></ulink>
      and you should use them whenever necessary.
  </para>
  </listitem>




src:

ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure.ac: Do not substitute datarootdir, htmldir,
        pdfdir, docdir.  Do not process --with-datarootdir,
        --with-htmldir, --with-pdfdir, --with-docdir.
        * configure: Regenerate.

gdb/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure.ac: Do not substitute datarootdir, htmldir,
        pdfdir, docdir.  Do not process --with-datarootdir,
        --with-htmldir, --with-pdfdir, --with-docdir.
        * configure: Regenerate.
        * CONTRIBUTE: Bump documented Autoconf version.

gdb/doc/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * configure.ac: Do not substitute datarootdir, htmldir,
        pdfdir, docdir.  Do not process --with-datarootdir,
        --with-htmldir, --with-pdfdir, --with-docdir.
        * configure: Regenerate.

gprof/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * 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/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.am (install-pdf, install-html): Remove.
        * Makefile.in: Regenerate.

gas/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * 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/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * 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/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * 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/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.am (datarootdir, docdir, htmldor, pdfdir)
        (install-pdf, install-pdf-recursive, install-html)
        (install-html-recursive): Remove.
        * Makefile.in: Regenerate.

bfd/doc/ChangeLog:
2009-08-15  Ralf Wildenhues  <[hidden email]>

        * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am)
        (html__strip_dir, install-html, install-html-am): Remove.
        * Makefile.in: Regenerate.

diff --git a/configure.ac b/configure.ac
index a594222..1e76600 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2946,30 +2946,4 @@ 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)
-
 AC_OUTPUT(Makefile)
diff --git a/gdb/CONTRIBUTE b/gdb/CONTRIBUTE
index 75b6ddf..8ed656b 100644
--- a/gdb/CONTRIBUTE
+++ b/gdb/CONTRIBUTE
@@ -121,7 +121,7 @@ o If ``gdb/configure.ac'' is modified then you don't
  ``configure''.
 
  The maintainer will re-generate those files
- using autoconf (2.59 as of 2005-01-07).
+ using autoconf (2.64 as of 2009-08-15).
 
 
 o If ``gdb/gdbarch.sh'' is modified, you don't
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 9dc736c..aa0bf75 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1917,32 +1917,6 @@ dnl  At the moment, we just assume it's UTF-8.
 AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
           [Define to be a string naming the default host character set.])
 
-# Flags needed to enable html installing and building
-AC_ARG_WITH(datarootdir,
-AC_HELP_STRING([--with-datarootdir], [use datarootdir as the data root directory.]),
-[datarootdir="\${prefix}/${withval}"],
-[datarootdir="\${prefix}/share"])
-
-AC_ARG_WITH(docdir,
-AC_HELP_STRING([--with-docdir], [install documentation in this directory.]),
-[docdir="\${prefix}/${withval}"],
-[docdir="\${datarootdir}/doc"])
-
-AC_ARG_WITH(pdfdir,
-AC_HELP_STRING([--with-pdfdir], [install pdf in this directory.]),
-[pdfdir="\${prefix}/${withval}"],
-[pdfdir="\${docdir}"])
-
-AC_ARG_WITH(htmldir,
-AC_HELP_STRING([--with-htmldir], [install html in this directory.]),
-[htmldir="\${prefix}/${withval}"],
-[htmldir="\${docdir}"])
-
-AC_SUBST(datarootdir)
-AC_SUBST(docdir)
-AC_SUBST(htmldir)
-AC_SUBST(pdfdir)
-
 AC_OUTPUT(Makefile .gdbinit:gdbinit.in gnulib/Makefile,
 [
 case x$CONFIG_HEADERS in
diff --git a/gdb/doc/configure.ac b/gdb/doc/configure.ac
index b7a2b48..3baea74 100644
--- a/gdb/doc/configure.ac
+++ b/gdb/doc/configure.ac
@@ -4,32 +4,6 @@ sinclude(../../config/acx.m4)
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
-# Flags needed to enable html installing and building
-AC_ARG_WITH(datarootdir,
-AC_HELP_STRING([--with-datarootdir], [use datarootdir as the data root directory.]),
-[datarootdir="\${prefix}/${withval}"],
-[datarootdir="\${prefix}/share"])
-
-AC_ARG_WITH(docdir,
-AC_HELP_STRING([--with-docdir], [install documentation in this directory.]),
-[docdir="\${prefix}/${withval}"],
-[docdir="\${datarootdir}/doc"])
-
-AC_ARG_WITH(pdfdir,
-AC_HELP_STRING([--with-pdfdir], [install pdf in this directory.]),
-[pdfdir="\${prefix}/${withval}"],
-[pdfdir="\${docdir}"])
-
-AC_ARG_WITH(htmldir,
-AC_HELP_STRING([--with-htmldir], [install html in this directory.]),
-[htmldir="\${prefix}/${withval}"],
-[htmldir="\${docdir}"])
-
-AC_SUBST(datarootdir)
-AC_SUBST(docdir)
-AC_SUBST(htmldir)
-AC_SUBST(pdfdir)
-
 ACX_PKGVERSION([GDB])
 ACX_BUGURL([http://www.gnu.org/software/gdb/bugs/])
 AC_OUTPUT(Makefile)
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 73ff953..5d2ed37 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -16,11 +16,6 @@ bfddocdir = doc
 bfdlibdir = @bfdlibdir@
 bfdincludedir = @bfdincludedir@
 
-datarootdir = @datarootdir@
-docdir = @docdir@
-htmldir = @htmldir@
-pdfdir = @pdfdir@
-
 bfdlib_LTLIBRARIES = libbfd.la
 
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -719,64 +714,6 @@ po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES)
 
 all diststuff: info
 
-.PHONY: install-pdf install-pdf-am install-pdf-recursive
-
-install-pdf: install-pdf-recursive
-
-install-pdf-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-.PHONY: install-html install-html-am install-html-recursive
-
-install-html: install-html-recursive
-
-install-html-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
 # Various kinds of .o files to put in libbfd.a:
 # BFD_BACKENDS Routines the configured targets need.
 # BFD_MACHINES Architecture-specific routines the configured targets need.
diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
index d5b3fba..2a10fc0 100644
--- a/bfd/doc/Makefile.am
+++ b/bfd/doc/Makefile.am
@@ -296,41 +296,6 @@ MAINTAINERCLEANFILES = $(DOCFILES)
 # cygnus option.
 install: install-info
 
-pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-pdf: install-pdf-am
-
-install-pdf-am: $(PDFS)
- @$(NORMAL_INSTALL)
- test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
-  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-  f=$(pdf__strip_dir) \
-  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
-  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
-
-html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-html: install-html-am
-
-install-html-am: $(HTMLS)
- @$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
- @list='$(HTMLS)'; for p in $$list; do \
-  if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
-  f=$(html__strip_dir) \
-  if test -d "$$d$$p"; then \
-    echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
-  else \
-    echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
-  fi; \
- done
-
 MAINTAINERCLEANFILES += bfd.info
 
 # Automake 1.9 will only build info files in the objdir if they are
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 636140d..2d38715 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -116,64 +116,6 @@ OPCODES = ../opcodes/libopcodes.la
 
 LIBIBERTY = ../libiberty/libiberty.a
 
-.PHONY: install-pdf install-pdf-am install-pdf-recursive
-
-install-pdf: install-pdf-recursive
-
-install-pdf-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-.PHONY: install-html install-html-am install-html-recursive
-
-install-html: install-html-recursive
-
-install-html-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
 POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
 po/POTFILES.in: @MAINT@ Makefile
  for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index 71aa192..bdd470d 100644
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -161,41 +161,6 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefile
 # cygnus option.
 install-data-local: install-info
 
-pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-pdf: install-pdf-am
-
-install-pdf-am: $(PDFS)
- @$(NORMAL_INSTALL)
- test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
-  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-  f=$(pdf__strip_dir) \
-  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
-  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
-
-html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-html: install-html-am
-
-install-html-am: $(HTMLS)
- @$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
- @list='$(HTMLS)'; for p in $$list; do \
-  if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
-  f=$(html__strip_dir) \
-  if test -d "$$d$$p"; then \
-    echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
-  else \
-    echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
-  fi; \
- done
-
 MAINTAINERCLEANFILES = binutils.info
 
 # Automake 1.9 will only build info files in the objdir if they are
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 5501325..8f4ede5 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -725,64 +725,6 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core \
 
 CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2A DEP1 DEPA DEP DEPDIR
 
-.PHONY: install-pdf install-pdf-am install-pdf-recursive
-
-install-pdf: install-pdf-recursive
-
-install-pdf-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-.PHONY: install-html install-html-am install-html-recursive
-
-install-html: install-html-recursive
-
-install-html-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
 .PHONY: install-exec-local install-data-local
 .PHONY: install-exec-bindir install-exec-tooldir
 
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 6a02ccf..3042650 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -73,41 +73,6 @@ CPU_DOCS = \
 # cygnus option.
 install-data-local: install-info
 
-pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-pdf: install-pdf-am
-
-install-pdf-am: $(PDFS)
- @$(NORMAL_INSTALL)
- test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
-  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-  f=$(pdf__strip_dir) \
-  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
-  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
-
-html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-html: install-html-am
-
-install-html-am: $(HTMLS)
- @$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
- @list='$(HTMLS)'; for p in $$list; do \
-  if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
-  f=$(html__strip_dir) \
-  if test -d "$$d$$p"; then \
-    echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
-  else \
-    echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
-  fi; \
- done
-
 # This one isn't ready for prime time yet.  Not even a little bit.
 
 noinst_TEXINFOS = internals.texi
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 12d794b..6c73106 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -83,95 +83,6 @@ gprof.1: $(srcdir)/gprof.texi config.texi
        (rm -f $@.T$$$$ && exit 1)
  rm -f gprof.pod
 
-.PHONY: install-pdf install-pdf-am install-pdf-recursive
-
-pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-pdf: install-pdf-recursive install-pdf-am
-
-install-pdf-am: $(PDFS)
- @$(NORMAL_INSTALL)
- test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
-  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-  f=$(pdf__strip_dir) \
-  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
-  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
-
-install-pdf-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-.PHONY: install-html install-html-am install-html-recursive
-
-html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-html: install-html-recursive  install-html-am
-
-install-html-am: $(HTMLS)
- @$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
- @list='$(HTMLS)'; for p in $$list; do \
-  if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
-  f=$(html__strip_dir) \
-  if test -d "$$d$$p"; then \
-    echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
-  else \
-    echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
-  fi; \
- done
-
-install-html-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
 install-data-local: install-info
diff --git a/ld/Makefile.am b/ld/Makefile.am
index b4e291c..2a2b519 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1872,95 +1872,6 @@ mostlyclean-local:
  -rm -rf tmpdir
 CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 spu_ovl.s spu_ovl.o spu_icache.s spu_icache.o
 
-.PHONY: install-pdf install-pdf-am install-pdf-recursive
-
-pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-pdf: install-pdf-recursive install-pdf-am
-
-install-pdf-am: $(PDFS)
- @$(NORMAL_INSTALL)
- test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
-  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-  f=$(pdf__strip_dir) \
-  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
-  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
-
-install-pdf-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-.PHONY: install-html install-html-am install-html-recursive
-
-html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-html: install-html-recursive  install-html-am
-
-install-html-am: $(HTMLS)
- @$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
- @list='$(HTMLS)'; for p in $$list; do \
-  if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
-  f=$(html__strip_dir) \
-  if test -d "$$d$$p"; then \
-    echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
-  else \
-    echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
-    $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
-  fi; \
- done
-
-install-html-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
-  case $$f in \
-    *=* | --[!k]*);; \
-    *k*) failcom='fail=yes';; \
-  esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-  echo "Making $$target in $$subdir"; \
-  if test "$$subdir" = "."; then \
-    dot_seen=yes; \
-    local_target="$$target-am"; \
-  else \
-    local_target="$$target"; \
-  fi; \
-  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-  || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
 .PHONY: install-exec-local install-data-local
 
 install-exec-local: ld-new$(EXEEXT)
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index d2a76c7..4f30b42 100644
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -16,12 +16,6 @@ AM_CFLAGS = $(WARN_CFLAGS)
 bfdlibdir = @bfdlibdir@
 bfdincludedir = @bfdincludedir@
 
-.PHONY: install-pdf
-install-pdf:
-
-.PHONY: install-html
-install-html:
-
 bfdlib_LTLIBRARIES = libopcodes.la
 
 # This is where bfd.h lives.
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 4/N] The big bump

Richard Biener
In reply to this post by Ralf Wildenhues
On Sat, Aug 15, 2009 at 1:33 PM, Ralf Wildenhues<[hidden email]> wrote:
>> - Bump Autoconf version to 2.64 in override.m4, and regenerate the
>>   world with 2.64 and Automake 1.11,
>
> OK?

Shouldn't the classpath changes be made upstream and a new version be
imported instead?

I just checked, and current openSUSE Factory still has autoconf 2.63 ...

Richard.

> Thanks,
> Ralf
>
> The patch is really small (if you omit the generated files) ...
>
> diff --git a/config/override.m4 b/config/override.m4
> index bf112db..903bb9a 100644
> --- a/config/override.m4
> +++ b/config/override.m4
> @@ -40,7 +40,7 @@ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
>
>  dnl Ensure exactly this Autoconf version is used
>  m4_ifndef([_GCC_AUTOCONF_VERSION],
> -  [m4_define([_GCC_AUTOCONF_VERSION], [2.59])])
> +  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
>
>  dnl Test for the exact version when AC_INIT is expanded.
>  dnl This allows to update the tree in steps (for testing)
>
>
> ... but the accompanying ChangeLog entries are rather not  :-)
> (and the generated files diffs weigh a few MB):
>
> GCC:
>
> config/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * override.m4 (_GCC_AUTOCONF_VERSION): Bump to 2.64.
>
> ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> intl/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4: Regenerate.
>        * configure: Regenerate.
>
> libiberty/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Regenerate.
>
> boehm-gc/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * configure: Regenerate.
>        * include/Makefile.in: Regenerate.
>        * include/gc_config.h.in: Regenerate.
>
> fixincludes/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4: Regenerate.
>        * configure: Regenerate.
>
> gcc/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4: Regenerate.
>        * config.in: Regenerate.
>        * configure: Regenerate.
>
> libgcc/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> gnattools/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> libada/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> libcpp/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4: Regenerate.
>        * config.in: Regenerate.
>        * configure: Regenerate.
>
> libdecnumber/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4: Regenerate.
>        * configure: Regenerate.
>
> libffi/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * configure: Regenerate.
>        * fficonfig.h.in: Regenerate.
>        * include/Makefile.in: Regenerate.
>        * man/Makefile.in: Regenerate.
>        * testsuite/Makefile.in: Regenerate.
>
> libgfortran/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * config.h.in: Regenerate.
>        * configure: Regenerate.
>
> libgomp/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * config.h.in: Regenerate.
>        * configure: Regenerate.
>        * testsuite/Makefile.in: Regenerate.
>
> libjava/classpath/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * configure: Regenerate.
>        * doc/Makefile.in: Regenerate.
>        * doc/api/Makefile.in: Regenerate.
>        * examples/Makefile.in: Regenerate.
>        * external/Makefile.in: Regenerate.
>        * external/jsr166/Makefile.in: Regenerate.
>        * external/relaxngDatatype/Makefile.in: Regenerate.
>        * external/sax/Makefile.in: Regenerate.
>        * external/w3c_dom/Makefile.in: Regenerate.
>        * include/Makefile.in: Regenerate.
>        * include/config.h.in: Regenerate.
>        * lib/Makefile.in: Regenerate.
>        * native/Makefile.in: Regenerate.
>        * native/fdlibm/Makefile.in: Regenerate.
>        * native/jawt/Makefile.in: Regenerate.
>        * native/jni/Makefile.in: Regenerate.
>        * native/jni/classpath/Makefile.in: Regenerate.
>        * native/jni/gconf-peer/Makefile.in: Regenerate.
>        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
>        * native/jni/gtk-peer/Makefile.in: Regenerate.
>        * native/jni/java-io/Makefile.in: Regenerate.
>        * native/jni/java-lang/Makefile.in: Regenerate.
>        * native/jni/java-math/Makefile.in: Regenerate.
>        * native/jni/java-net/Makefile.in: Regenerate.
>        * native/jni/java-nio/Makefile.in: Regenerate.
>        * native/jni/java-util/Makefile.in: Regenerate.
>        * native/jni/midi-alsa/Makefile.in: Regenerate.
>        * native/jni/midi-dssi/Makefile.in: Regenerate.
>        * native/jni/native-lib/Makefile.in: Regenerate.
>        * native/jni/qt-peer/Makefile.in: Regenerate.
>        * native/jni/xmlj/Makefile.in: Regenerate.
>        * native/plugin/Makefile.in: Regenerate.
>        * resource/Makefile.in: Regenerate.
>        * scripts/Makefile.in: Regenerate.
>        * tools/Makefile.in: Regenerate.
>
> libjava/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * configure: Regenerate.
>        * gcj/Makefile.in: Regenerate.
>        * include/Makefile.in: Regenerate.
>        * include/config.h.in: Regenerate.
>        * testsuite/Makefile.in: Regenerate.
>
> libjava/libltdl/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * config-h.in: Regenerate.
>        * configure: Regenerate.
>
> libmudflap/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * config.h.in: Regenerate.
>        * configure: Regenerate.
>        * testsuite/Makefile.in: Regenerate.
>
> libobjc/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4: Regenerate.
>        * configure: Regenerate.
>        * config.h.in: Regenerate.
>
> libssp/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * config.h.in: Regenerate.
>        * configure: Regenerate.
>
> libstdc++-v3/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * acinclude.m4: Regenerate.
>        * aclocal.m4: Regenerate.
>        * config.h.in: Regenerate.
>        * configure: Regenerate.
>        * doc/Makefile.in: Regenerate.
>        * include/Makefile.in: Regenerate.
>        * libsupc++/Makefile.in: Regenerate.
>        * po/Makefile.in: Regenerate.
>        * python/Makefile.in: Regenerate.
>        * src/Makefile.in: Regenerate.
>        * testsuite/Makefile.in: Regenerate.
>
> zlib/ChangeLog: Regenerate.
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Regenerate.
>        * configure: Regenerate.
>
>
> --- snip ---
>
> src:
>
> config/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * override.m4 (_GCC_AUTOCONF_VERSION): Bump to 2.64.
>
> intl/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4: Regenerate.
>        * config.h.in: Likewise.
>        * configure: Likewise.
>
> libdecnumber/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4: Regenerate.
>        * config.in: Likewise.
>        * configure: Likewise.
>
> etc/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> sim/common/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/iq2000/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/d10v/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/igen/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/m32r/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/frv/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * avr/config.in: Regenerate.
>        * avr/configure: Likewise.
>        * configure: Likewise.
>        * cris/config.in: Likewise.
>        * cris/configure: Likewise.
>
> sim/h8300/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/mn10300/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/ppc/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/erc32/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/arm/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/m68hc11/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/lm32/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/sh64/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/v850/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/cr16/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/moxie/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/m32c/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/mips/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/mcore/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> sim/testsuite/d10v-elf/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> sim/testsuite/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> sim/testsuite/frv-elf/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> sim/testsuite/m32r-elf/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> sim/testsuite/mips64el-elf/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> sim/sh/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> gold/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Likewise.
>        * config.in: Likewise.
>        * configure: Likewise.
>        * testsuite/Makefile.in: Likewise.
>
> gprof/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4
>        * configure: Likewise.
>        * gconfig.in: Likewise.
>
> libiberty/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * config.in: Regenerate.
>        * configure: Likewise.
>
> ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> opcodes/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Likewise.
>        * config.in: Likewise.
>        * configure: Likewise.
>
> readline/examples/rlfe/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> gas/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Likewise.
>        * config.in: Likewise.
>        * configure: Likewise.
>        * doc/Makefile.in: Likewise.
>
> ld/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4
>        * config.in: Likewise.
>        * configure: Likewise.
>
> gdb/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4  Regenerate.
>        * config.in: Likewise.
>        * configure: Likewise.
>        * gnulib/Makefile.in: Likewise.
>
> gdb/doc/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
> gdb/gdbserver/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * aclocal.m4: Regenerate.
>        * config.in: Likewise.
>        * configure: Likewise.
>
> gdb/testsuite/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>        * gdb.hp/configure: Likewise.
>        * gdb.hp/gdb.aCC/configure: Likewise.
>        * gdb.hp/gdb.base-hp/configure: Likewise.
>        * gdb.hp/gdb.compat/configure: Likewise.
>        * gdb.hp/gdb.defects/configure: Likewise.
>        * gdb.hp/gdb.objdbg/configure: Likewise.
>        * gdb.stabs/configure: Likewise.
>
> binutils/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Likewise.
>        * config.in: Likewise.
>        * configure: Likewise.
>        * doc/Makefile.in: Likewise.
>
> bfd/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>        * aclocal.m4: Likewise.
>        * config.in: Likewise.
>        * configure: Likewise.
>
> bfd/doc/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * Makefile.in: Regenerate.
>
> readline/ChangeLog.gdb:
> 2009-08-15  Ralf Wildenhues  <[hidden email]>
>
>        * configure: Regenerate.
>
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 4/N] The big bump

Ralf Wildenhues
Hello Richard,

* Richard Guenther wrote on Sat, Aug 15, 2009 at 01:48:54PM CEST:
> On Sat, Aug 15, 2009 at 1:33 PM, Ralf Wildenhues wrote:
> >> - Bump Autoconf version to 2.64 in override.m4, and regenerate the
> >>   world with 2.64 and Automake 1.11,
> >
> > OK?
>
> Shouldn't the classpath changes be made upstream and a new version be
> imported instead?

This patch set contains no changes to classpath except in generated
files (which are not checked in upstream) and in the one bit of
documentation.  Tom agreed to handle that (I Cc:ed him on the patch)
in <http://gcc.gnu.org/ml/gcc/2009-06/msg00680.html>.

> I just checked, and current openSUSE Factory still has autoconf 2.63 ...

I thought the consensus was to move to the most recent stable releases
when we would move.  At least there was no complaints to the plan
<http://gcc.gnu.org/ml/gcc/2009-06/msg00647.html>.

A move to 2.63 would be more work (backporting some known issues from
2.64); OTOH, for development, the situation does not grow worse with
2.64 from what we have now: you already have to have an extra set of
(old) tools installed somewhere.  We expect this situation to only
improve, as more distributions upgrade Autoconf.

Since its release on 2009-07-26, Autoconf 2.64 has not seen a regression
that impacted GCC's use of it AFAICS (and only minor ones otherwise).

Cheers,
Ralf
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 4/N] The big bump

Ralf Wildenhues
* Ralf Wildenhues wrote on Sat, Aug 15, 2009 at 02:22:58PM CEST:
>
> Since its release on 2009-07-26, Autoconf 2.64 has not seen a regression
> that impacted GCC's use of it AFAICS (and only minor ones otherwise).

Ah, hm, except for
<http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6839>
which is still pending.

Hmm.  Paolo, do you agree that we can probably fix this in
config/override.m4 if we should?

Sorry about that,
Ralf
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 4/N] The big bump

Dave Korn-6
In reply to this post by Ralf Wildenhues
Ralf Wildenhues wrote:

  Hi Ralf,

>> - Bump Autoconf version to 2.64 in override.m4, and regenerate the
>>   world with 2.64 and Automake 1.11,

> --- a/config/override.m4
> +++ b/config/override.m4

> -  [m4_define([_GCC_AUTOCONF_VERSION], [2.59])])
> +  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])

> src:
>
> config/ChangeLog: intl/ChangeLog: libdecnumber/ChangeLog: etc/ChangeLog:
> sim/common/ChangeLog: sim/iq2000/ChangeLog: sim/d10v/ChangeLog:
> sim/igen/ChangeLog: sim/m32r/ChangeLog: sim/frv/ChangeLog: sim/ChangeLog:
> sim/h8300/ChangeLog: sim/mn10300/ChangeLog: sim/ppc/ChangeLog:
> sim/erc32/ChangeLog: sim/arm/ChangeLog: sim/m68hc11/ChangeLog:
> sim/lm32/ChangeLog: sim/sh64/ChangeLog: sim/v850/ChangeLog:
> sim/cr16/ChangeLog: sim/moxie/ChangeLog: sim/m32c/ChangeLog:
> sim/mips/ChangeLog: sim/mcore/ChangeLog: sim/testsuite/d10v-elf/ChangeLog:
> sim/testsuite/ChangeLog: sim/testsuite/frv-elf/ChangeLog:
> sim/testsuite/m32r-elf/ChangeLog: sim/testsuite/mips64el-elf/ChangeLog:
> sim/sh/ChangeLog: gold/ChangeLog: gprof/ChangeLog: libiberty/ChangeLog:
> ChangeLog: opcodes/ChangeLog: readline/examples/rlfe/ChangeLog:
> gas/ChangeLog: ld/ChangeLog: gdb/ChangeLog: gdb/doc/ChangeLog:
> gdb/gdbserver/ChangeLog: gdb/testsuite/ChangeLog: binutils/ChangeLog:
> bfd/ChangeLog: bfd/doc/ChangeLog: readline/ChangeLog.gdb:

  Looking at the toplevel of/src, there are no changes to blt/, cgen/, cpu/,
dejagnu/, elfcpp/, expat/, expect/, itcl/, iwidgets/, libgloss/, libgui/,
mmalloc/, newlib/, rda/, sid/, tcl/, texinfo/, tix/, tk/, utils/ and winsup/.
 Are these all unaffected or are some of them liable to need updates too?

    cheers,
      DaveK

Reply | Threaded
Open this post in threaded view
|

Re: Moving to Autoconf 2.64, Automake 1.11

Joseph Myers
In reply to this post by Ralf Wildenhues
On Sat, 15 Aug 2009, Ralf Wildenhues wrote:

> - Update automake-provided helper scripts in the toplevel,
> - LIBTOOLFLAGS, and *_LINK fixes for Automake 1.11 (GCC only),
> - some minor fixes in sim, gold, gdb (src only)
> - Bump Autoconf version to 2.64 in override.m4, and regenerate the
>   world with 2.64 and Automake 1.11,
> - remove {all,install}-{html,pdf} and {dataroot,doc,pdf,html}dir stuff
>   not needed any more, update documentation bits throughout the tree.

I note that the patch series doesn't include resyncing shared build system
files that are out of sync between gcc and src.  Any chance this could be
done either before or after the above?

Makefile.def
Makefile.tpl
Makefile.in
config/ChangeLog
config/lead-dot.m4
config/mh-cygwin
config/mh-ppc-aix
config/tls.m4
config/unwind_ipinfo.m4
config/warnings.m4
configure.ac
configure
include/ChangeLog-9103

(The whole config directory should be exactly identical in both places,
including the ChangeLog.  Each repository has accumulated changes that
need merging to the other repository.  I believe such resyncing can be
considered preapproved since approval for a change to a shared file in one
repository is sufficient for it to go in the other as well.)

> The texinfo changes have been tested with 'make info pdf html'.

There should be a "make install-pdf install-html" test (for both gcc and
GDB/Binutils) as well.

> To make it easy for whoever volunteers for the --with-build-sysroot
> test, I would like to ask for this to be done after I commit the patch
> set.  OK?

Once the changes are in, CodeSourcery's next arm-none-linux-gnueabi
automatic test run will cover such a configuration.

--
Joseph S. Myers
[hidden email]
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 4/N] The big bump

Ralf Wildenhues
In reply to this post by Dave Korn-6
* Dave Korn wrote on Sat, Aug 15, 2009 at 04:54:28PM CEST:

> Ralf Wildenhues wrote:
> > src:
> >
> > config/ChangeLog: intl/ChangeLog: libdecnumber/ChangeLog: etc/ChangeLog:
> > sim/common/ChangeLog: sim/iq2000/ChangeLog: sim/d10v/ChangeLog:
> > sim/igen/ChangeLog: sim/m32r/ChangeLog: sim/frv/ChangeLog: sim/ChangeLog:
> > sim/h8300/ChangeLog: sim/mn10300/ChangeLog: sim/ppc/ChangeLog:
> > sim/erc32/ChangeLog: sim/arm/ChangeLog: sim/m68hc11/ChangeLog:
> > sim/lm32/ChangeLog: sim/sh64/ChangeLog: sim/v850/ChangeLog:
> > sim/cr16/ChangeLog: sim/moxie/ChangeLog: sim/m32c/ChangeLog:
> > sim/mips/ChangeLog: sim/mcore/ChangeLog: sim/testsuite/d10v-elf/ChangeLog:
> > sim/testsuite/ChangeLog: sim/testsuite/frv-elf/ChangeLog:
> > sim/testsuite/m32r-elf/ChangeLog: sim/testsuite/mips64el-elf/ChangeLog:
> > sim/sh/ChangeLog: gold/ChangeLog: gprof/ChangeLog: libiberty/ChangeLog:
> > ChangeLog: opcodes/ChangeLog: readline/examples/rlfe/ChangeLog:
> > gas/ChangeLog: ld/ChangeLog: gdb/ChangeLog: gdb/doc/ChangeLog:
> > gdb/gdbserver/ChangeLog: gdb/testsuite/ChangeLog: binutils/ChangeLog:
> > bfd/ChangeLog: bfd/doc/ChangeLog: readline/ChangeLog.gdb:
>
>   Looking at the toplevel of/src, there are no changes to blt/, cgen/, cpu/,
> dejagnu/, elfcpp/, expat/, expect/, itcl/, iwidgets/, libgloss/, libgui/,
> mmalloc/, newlib/, rda/, sid/, tcl/, texinfo/, tix/, tk/, utils/ and winsup/.

That is correct.

>  Are these all unaffected or are some of them liable to need updates too?

I have never ever gotten a full src tree to cleanly build with
--enable-maintainer-mode, and IIRC not even without.  I've always just
worked on the git binutils-gdb mirror.  The rest of the tree has IMHO
lacked lots of love at least on the build system side.  If you tell me
that it is used actively, and they are generally willing to see updated
build machinery (and there is somebody to review patches to this end,
timely, too), then I would look into this task.  But last time I looked
I didn't think a drift apart would make things any worse; for example,
Autoconf versions used were quite inconsistent already.

Sorry if I've misunderstood things there.

I hope there is a chance this does not need to happen in lock step.

Cheers,
Ralf
Reply | Threaded
Open this post in threaded view
|

Re: Moving to Autoconf 2.64, Automake 1.11

Ralf Wildenhues
In reply to this post by Joseph Myers
* Joseph S. Myers wrote on Sat, Aug 15, 2009 at 05:31:44PM CEST:

> On Sat, 15 Aug 2009, Ralf Wildenhues wrote:
>
> > - Update automake-provided helper scripts in the toplevel,
> > - LIBTOOLFLAGS, and *_LINK fixes for Automake 1.11 (GCC only),
> > - some minor fixes in sim, gold, gdb (src only)
> > - Bump Autoconf version to 2.64 in override.m4, and regenerate the
> >   world with 2.64 and Automake 1.11,
> > - remove {all,install}-{html,pdf} and {dataroot,doc,pdf,html}dir stuff
> >   not needed any more, update documentation bits throughout the tree.
>
> I note that the patch series doesn't include resyncing shared build system
> files that are out of sync between gcc and src.  Any chance this could be
> done either before or after the above?

Yes, I can look into it.  Sigh.

> (The whole config directory should be exactly identical in both places,
> including the ChangeLog.  Each repository has accumulated changes that
> need merging to the other repository.  I believe such resyncing can be
> considered preapproved since approval for a change to a shared file in one
> repository is sufficient for it to go in the other as well.)

OK thanks, that is quite helpful.

> > The texinfo changes have been tested with 'make info pdf html'.
>
> There should be a "make install-pdf install-html" test (for both gcc and
> GDB/Binutils) as well.

I think I tried that when changing the relevant rules, but I will test
again before committing.

> > To make it easy for whoever volunteers for the --with-build-sysroot
> > test, I would like to ask for this to be done after I commit the patch
> > set.  OK?
>
> Once the changes are in, CodeSourcery's next arm-none-linux-gnueabi
> automatic test run will cover such a configuration.

Great!

Thanks,
Ralf
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 4/N] The big bump

Paolo Bonzini-2
In reply to this post by Ralf Wildenhues
Ralf Wildenhues wrote:

> * Ralf Wildenhues wrote on Sat, Aug 15, 2009 at 02:22:58PM CEST:
>> Since its release on 2009-07-26, Autoconf 2.64 has not seen a regression
>> that impacted GCC's use of it AFAICS (and only minor ones otherwise).
>
> Ah, hm, except for
> <http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6839>
> which is still pending.
>
> Hmm.  Paolo, do you agree that we can probably fix this in
> config/override.m4 if we should?

Yes, we should fix it simply by dropping fopen from the program used in
the cross compilation + default file name test (like the
AC_LANG_NULL_PROGRAM in my patch).  It should be two lines in
override.m4, and they should be committed first.

Paolo
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 4/N] The big bump

Joseph Myers
In reply to this post by Dave Korn-6
On Sat, 15 Aug 2009, Dave Korn wrote:

>   Looking at the toplevel of/src, there are no changes to blt/, cgen/, cpu/,
> dejagnu/, elfcpp/, expat/, expect/, itcl/, iwidgets/, libgloss/, libgui/,
> mmalloc/, newlib/, rda/, sid/, tcl/, texinfo/, tix/, tk/, utils/ and winsup/.
>  Are these all unaffected or are some of them liable to need updates too?

Some of these do not exist on HEAD; they only have files in the Attic.  
Others do not have auto* source or generated files in them.  So the
potentially active set that may need updates is reduced to cgen/ itcl/
libgloss/ libgui/ newlib/ rda/ sid/ tcl/ tk/ utils/ winsup/.  At least
tcl/ and tk/ are imports of pretty old upstream versions (itcl/ also looks
like an import from upstream) and it would be good if they too could be
removed from HEAD as various other imports of upstream-maintained tools
(DejaGnu, Expect etc.) have been over time.

I think cgen/ libgloss/ libgui/ newlib/ rda/ sid/ utils/ winsup/ actually
live in the src repository as their main home.

--
Joseph S. Myers
[hidden email]
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 4/N] The big bump

Dave Korn-6
In reply to this post by Ralf Wildenhues
Ralf Wildenhues wrote:

> I have never ever gotten a full src tree to cleanly build with
> --enable-maintainer-mode, and IIRC not even without.  I've always just
> worked on the git binutils-gdb mirror.  The rest of the tree has IMHO
> lacked lots of love at least on the build system side.  If you tell me
> that it is used actively, and they are generally willing to see updated
> build machinery (and there is somebody to review patches to this end,
> timely, too), then I would look into this task.  But last time I looked
> I didn't think a drift apart would make things any worse; for example,
> Autoconf versions used were quite inconsistent already.

  Well, the winsup/ directory is pretty heavily used, winsup == cygwin +
mingw!  I can help with the testing if you can help with the patching; winsup
depends on newlib, so I can test those together for you.  I think Joseph's
cut-down list looks about right for the rest.

    cheers,
      DaveK

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 5/N] post-update cleanups

Paolo Bonzini-2
In reply to this post by Ralf Wildenhues
The GCC bits are fine by me.  It will likely take a few days until we
finish discussing the details of override.m4 and testing the src/
directories, and this will give enough time to the binutils and gdb
folks to look at the patch & scream.

Thanks again!

Paolo
Reply | Threaded
Open this post in threaded view
|

Re: Moving to Autoconf 2.64, Automake 1.11

Paolo Bonzini-2
In reply to this post by Ralf Wildenhues

> - fix the (new with Autoconf 2.64) warnings from configure about unknown
>   --enable/--with switches.  I would appreciate some input on whether
>   this functionality should just be turned off with
>   AC_DISABLE_OPTION_CHECKING, or we should add some logic to the
>   toplevel configure script to be more intelligent about it.

For toplevel, add AC_DISABLE_OPTION_CHECKING definitely (at the same
time as the regeneration).

For other directories, we can decide later on a case-by-case basis.

Just for fun, if you have a diffstat of the world-regeneration, it would
be nice to see it.

Paolo
Reply | Threaded
Open this post in threaded view
|

Re: Moving to Autoconf 2.64, Automake 1.11

Ralf Wildenhues
* Paolo Bonzini wrote on Sat, Aug 15, 2009 at 08:04:29PM CEST:
> Just for fun, if you have a diffstat of the world-regeneration, it would
> be nice to see it.

GCC:

 boehm-gc/Makefile.in                               |  308 +-
 boehm-gc/aclocal.m4                                |  478 +-
 boehm-gc/configure                                 |11978 +--
 boehm-gc/include/Makefile.in                       |  188 +-
 boehm-gc/include/gc_config.h.in                    |    3 +
 configure                                          | 9549 +-
 config/override.m4                                 |    2 +-
 fixincludes/aclocal.m4                             |    4 +-
 fixincludes/configure                              | 7960 +-
 gcc/aclocal.m4                                     |   20 +-
 gcc/config.in                                      |   83 +-
 gcc/configure                                      |19768 ++---
 gnattools/configure                                | 4109 +-
 intl/aclocal.m4                                    |    5 +-
 intl/configure                                     | 7855 +-
 libada/configure                                   | 4865 +-
 libcpp/aclocal.m4                                  |    5 +-
 libcpp/config.in                                   |   13 +-
 libcpp/configure                                   |10947 +--
 libdecnumber/aclocal.m4                            |    4 +-
 libdecnumber/configure                             |10165 +--
 libffi/Makefile.in                                 |  595 +-
 libffi/aclocal.m4                                  |  483 +-
 libffi/configure                                   |11950 +--
 libffi/fficonfig.h.in                              |   26 +-
 libffi/include/Makefile.in                         |  272 +-
 libffi/man/Makefile.in                             |  302 +-
 libffi/testsuite/Makefile.in                       |  201 +-
 libgcc/configure                                   | 5055 +-
 libgfortran/Makefile.in                            | 3247 +-
 libgfortran/aclocal.m4                             |  463 +-
 libgfortran/config.h.in                            |   21 +-
 libgfortran/configure                              |28127 ++----
 libgomp/Makefile.in                                |  610 +-
 libgomp/aclocal.m4                                 |  463 +-
 libgomp/config.h.in                                |   13 +-
 libgomp/configure                                  |17029 +--
 libgomp/testsuite/Makefile.in                      |  155 +-
 libiberty/config.in                                |   22 +-
 libiberty/configure                                |11204 +--
 libjava/Makefile.in                                | 1142 +-
 libjava/aclocal.m4                                 |  478 +-
 libjava/classpath/Makefile.in                      |  379 +-
 libjava/classpath/aclocal.m4                       |  518 +-
 libjava/classpath/configure                        |23059 ++---
 libjava/classpath/doc/Makefile.in                  |  575 +-
 libjava/classpath/doc/api/Makefile.in              |  200 +-
 libjava/classpath/examples/Makefile.in             |  243 +-
 libjava/classpath/external/Makefile.in             |  329 +-
 libjava/classpath/external/jsr166/Makefile.in      |  201 +-
 .../classpath/external/relaxngDatatype/Makefile.in |  201 +-
 libjava/classpath/external/sax/Makefile.in         |  201 +-
 libjava/classpath/external/w3c_dom/Makefile.in     |  201 +-
 libjava/classpath/include/Makefile.in              |  204 +-
 libjava/classpath/include/config.h.in              |   19 +-
 libjava/classpath/lib/Makefile.in                  |  199 +-
 libjava/classpath/native/Makefile.in               |  329 +-
 libjava/classpath/native/fdlibm/Makefile.in        |  264 +-
 libjava/classpath/native/jawt/Makefile.in          |  313 +-
 libjava/classpath/native/jni/Makefile.in           |  331 +-
 libjava/classpath/native/jni/classpath/Makefile.in |  264 +-
 .../classpath/native/jni/gconf-peer/Makefile.in    |  313 +-
 .../native/jni/gstreamer-peer/Makefile.in          |  313 +-
 libjava/classpath/native/jni/gtk-peer/Makefile.in  |  313 +-
 libjava/classpath/native/jni/java-io/Makefile.in   |  310 +-
 libjava/classpath/native/jni/java-lang/Makefile.in |  314 +-
 libjava/classpath/native/jni/java-math/Makefile.in |  313 +-
 libjava/classpath/native/jni/java-net/Makefile.in  |  310 +-
 libjava/classpath/native/jni/java-nio/Makefile.in  |  310 +-
 libjava/classpath/native/jni/java-util/Makefile.in |  310 +-
 libjava/classpath/native/jni/midi-alsa/Makefile.in |  313 +-
 libjava/classpath/native/jni/midi-dssi/Makefile.in |  313 +-
 .../classpath/native/jni/native-lib/Makefile.in    |  264 +-
 libjava/classpath/native/jni/qt-peer/Makefile.in   |  278 +-
 libjava/classpath/native/jni/xmlj/Makefile.in      |  310 +-
 libjava/classpath/native/plugin/Makefile.in        |  320 +-
 libjava/classpath/resource/Makefile.in             |  265 +-
 libjava/classpath/scripts/Makefile.in              |  200 +-
 libjava/classpath/tools/Makefile.in                |  616 +-
 libjava/configure                                  |19848 ++---
 libjava/gcj/Makefile.in                            |  311 +-
 libjava/include/Makefile.in                        |  286 +-
 libjava/include/config.h.in                        |   32 +-
 libjava/libltdl/Makefile.in                        |  341 +-
 libjava/libltdl/aclocal.m4                         |  463 +-
 libjava/libltdl/config-h.in                        |    3 +
 libjava/libltdl/configure                          |13247 +--
 libjava/testsuite/Makefile.in                      |  210 +-
 libmudflap/Makefile.in                             |  486 +-
 libmudflap/aclocal.m4                              |  463 +-
 libmudflap/config.h.in                             |    3 +
 libmudflap/configure                               |10984 +--
 libmudflap/testsuite/Makefile.in                   |  151 +-
 libobjc/aclocal.m4                                 |   81 +-
 libobjc/config.h.in                                |    3 +
 libobjc/configure                                  | 8706 +-
 libssp/Makefile.in                                 |  361 +-
 libssp/aclocal.m4                                  |  463 +-
 libssp/config.h.in                                 |    3 +
 libssp/configure                                   | 8954 +-
 libstdc++-v3/Makefile.in                           |  335 +-
 libstdc++-v3/aclocal.m4                            |  291 +-
 libstdc++-v3/config.h.in                           |   13 +-
 libstdc++-v3/configure                             |110803 +++-----------------
 libstdc++-v3/doc/Makefile.in                       |  166 +-
 libstdc++-v3/include/Makefile.in                   |  167 +-
 libstdc++-v3/libsupc++/Makefile.in                 |  260 +-
 libstdc++-v3/po/Makefile.in                        |  166 +-
 libstdc++-v3/python/Makefile.in                    |  216 +-
 libstdc++-v3/src/Makefile.in                       |  262 +-
 libstdc++-v3/testsuite/Makefile.in                 |  166 +-
 zlib/Makefile.in                                   |  217 +-
 zlib/aclocal.m4                                    |  463 +-
 zlib/configure                                     | 8951 +-
 113 files changed, 135429 insertions(+), 256326 deletions(-)

src:

 bfd/Makefile.in                            |  307 +-
 bfd/aclocal.m4                             |  468 +-
 bfd/config.in                              |   60 +-
 bfd/configure                              |19335 ++++++++------------------
 bfd/doc/Makefile.in                        |  289 +-
 binutils/Makefile.in                       |  416 +-
 binutils/aclocal.m4                        |  468 +-
 binutils/config.in                         |   54 +-
 binutils/configure                         |13087 +++++++-----------
 binutils/doc/Makefile.in                   |  375 +-
 config/override.m4                         |    2 +-
 configure                                  | 9309 +++++++------
 etc/configure                              | 2923 +++--
 gas/Makefile.in                            |  321 +-
 gas/aclocal.m4                             |  464 +-
 gas/config.in                              |   71 +-
 gas/configure                              |12204 ++++++++---------
 gas/doc/Makefile.in                        |  362 +-
 gdb/aclocal.m4                             |  483 +-
 gdb/config.in                              |   44 +-
 gdb/configure                              |20691 +++++++++-------------------
 gdb/doc/configure                          | 2999 +++--
 gdb/gdbserver/aclocal.m4                   |    4 +-
 gdb/gdbserver/config.in                    |   38 +-
 gdb/gdbserver/configure                    | 7031 +++++-----
 gdb/gnulib/Makefile.in                     |  189 +-
 gdb/testsuite/configure                    | 5172 ++++----
 gdb/testsuite/gdb.hp/configure             | 3206 +++--
 gdb/testsuite/gdb.hp/gdb.aCC/configure     | 3018 +++--
 gdb/testsuite/gdb.hp/gdb.base-hp/configure | 3018 +++--
 gdb/testsuite/gdb.hp/gdb.compat/configure  | 3018 +++--
 gdb/testsuite/gdb.hp/gdb.defects/configure | 3018 +++--
 gdb/testsuite/gdb.hp/gdb.objdbg/configure  | 3206 +++--
 gdb/testsuite/gdb.stabs/configure          | 3018 +++--
 gold/Makefile.in                           |  485 +-
 gold/aclocal.m4                            |  463 +-
 gold/config.in                             |   59 +-
 gold/configure                             |11148 +++++++---------
 gold/testsuite/Makefile.in                 |  624 +-
 gprof/Makefile.in                          |  591 +-
 gprof/aclocal.m4                           |  464 +-
 gprof/configure                            |10379 +++++++--------
 gprof/gconfig.in                           |   46 +-
 intl/aclocal.m4                            |    5 +-
 intl/config.h.in                           |    9 +-
 intl/configure                             | 7855 +++++------
 ld/Makefile.in                             |  577 +-
 ld/aclocal.m4                              |  464 +-
 ld/config.in                               |   54 +-
 ld/configure                               |12425 ++++++++----------
 libdecnumber/aclocal.m4                    |    4 +-
 libdecnumber/config.in                     |   32 +-
 libdecnumber/configure                     |10165 +++++---------
 libiberty/config.in                        |   22 +-
 libiberty/configure                        |11204 ++++++---------
 opcodes/Makefile.in                        |  249 +-
 opcodes/aclocal.m4                         |  464 +-
 opcodes/config.in                          |   34 +-
 opcodes/configure                          |10413 +++++++--------
 readline/configure                         | 9776 +++++--------
 readline/examples/rlfe/configure           | 5977 ++++----
 sim/arm/config.in                          |    3 +
 sim/arm/configure                          | 7088 +++++------
 sim/avr/config.in                          |    3 +
 sim/avr/configure                          | 6937 +++++-----
 sim/common/config.in                       |    3 +
 sim/common/configure                       | 8507 +++++-------
 sim/configure                              | 5248 ++++----
 sim/cr16/config.in                         |    3 +
 sim/cr16/configure                         | 7146 +++++------
 sim/cris/config.in                         |   20 +-
 sim/cris/configure                         | 7612 +++++------
 sim/d10v/config.in                         |    3 +
 sim/d10v/configure                         | 7146 +++++------
 sim/erc32/config.in                        |    3 +
 sim/erc32/configure                        | 7225 +++++------
 sim/frv/config.in                          |   20 +-
 sim/frv/configure                          | 7404 +++++------
 sim/h8300/config.in                        |    3 +
 sim/h8300/configure                        | 7087 +++++------
 sim/igen/config.in                         |    3 +
 sim/igen/configure                         | 5893 ++++----
 sim/iq2000/config.in                       |   20 +-
 sim/iq2000/configure                       | 7398 +++++------
 sim/lm32/config.in                         |    3 +
 sim/lm32/configure                         | 3901 ++----
 sim/m32c/config.in                         |    3 +
 sim/m32c/configure                         | 6937 +++++-----
 sim/m32r/config.in                         |   20 +-
 sim/m32r/configure                         | 7402 +++++------
 sim/m68hc11/config.in                      |   20 +-
 sim/m68hc11/configure                      | 7551 +++++------
 sim/mcore/config.in                        |    3 +
 sim/mcore/configure                        | 7083 +++++------
 sim/mips/config.in                         |   20 +-
 sim/mips/configure                         | 8008 +++++------
 sim/mn10300/config.in                      |   20 +-
 sim/mn10300/configure                      | 7710 +++++------
 sim/moxie/config.in                        |   12 +
 sim/moxie/configure                        | 6997 +++++-----
 sim/ppc/config.in                          |   36 +-
 sim/ppc/configure                          | 9475 ++++++-------
 sim/sh/config.in                           |    3 +
 sim/sh/configure                           | 7083 +++++------
 sim/sh64/config.in                         |   20 +-
 sim/sh64/configure                         | 7398 +++++------
 sim/testsuite/configure                    | 3220 +++--
 sim/testsuite/d10v-elf/configure           | 3018 +++--
 sim/testsuite/frv-elf/configure            | 3018 +++--
 sim/testsuite/m32r-elf/configure           | 3018 +++--
 sim/testsuite/mips64el-elf/configure       | 3018 +++--
 sim/v850/config.in                         |   20 +-
 sim/v850/configure                         | 7688 +++++------
 113 files changed, 183039 insertions(+), 217097 deletions(-)

Why, by the way, do some of the trees in src contains so endlessly many
configure scripts?  Can't they be consolidated?

Cheers,
Ralf
Reply | Threaded
Open this post in threaded view
|

Do not point to sources.redhat.com for autotools tarballs (was: Moving to Autoconf 2.64, Automake 1.11)

Ralf Wildenhues
In reply to this post by Gerald Pfeifer
* Gerald Pfeifer wrote on Sat, Aug 15, 2009 at 01:34:15PM CEST:

> On Sat, 15 Aug 2009, Ralf Wildenhues wrote:
> > Apart from that, I would need somebody to update the autotools tarballs
> > at ftp://sources.redhat.com/pub/binutils for me, at the time I am
> > committing the above.  The upstream tarballs are available here:
> >   ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.64.tar.gz
> >   ftp://ftp.gnu.org/gnu/automake/automake-1.11.tar.gz
>
> Looking at the dates of the original tarballs (which look like snapshots
> needed at that point in time), I am wondering why we shouldn't just refer
> to the vanilla upstream versions and downloads?

FWIW, I wouldn't mind such a move at all, esp. considering that these
snapshots are pretty outdated.  However, the pub/binutils location can
serve as as useful indirection in case we do need to rely on unreleased
versions again.

At least the gettext version used throughout GCC/src is pretty old,
and/or not consistent anyway.  I don't know if there is need to update
it, though.

Below is a proposed patch that would let src refer to upstream versions,
to be squashed in with [PATCH 5/N] of this series (tested make info html
pdf).

Thanks,
Ralf

ChangeLog:
2009-08-16  Ralf Wildenhues  <[hidden email]>

        * README-maintainer-mode: Point directly to upstream locations
        for autoconf, automake, libtool, gettext, instead of copies on
        sources.redhat.com.  Document required versions.

gdb/doc/ChangeLog:
2009-08-16  Ralf Wildenhues  <[hidden email]>

        * gdbint.texinfo (Releasing GDB): Point to
        README-maintainer-mode file for required autoconf version.

diff --git a/README-maintainer-mode b/README-maintainer-mode
index 0115a1e..a350974 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/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index b1c0452..6d0a226 100644
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -7078,10 +7078,9 @@ Notes:
 @itemize @bullet
 @item
 Check the @code{autoconf} version carefully.  You want to be using the
-version taken from the @file{binutils} snapshot directory, which can be
-found at @uref{ftp://sourceware.org/pub/binutils/}.  It is very
-unlikely that a system installed version of @code{autoconf} (e.g.,
-@file{/usr/bin/autoconf}) is correct.
+version documented in the toplevel @file{README-maintainer-mode} file.
+It is very unlikely that a system installed version of @code{autoconf}
+(e.g., @file{/usr/bin/autoconf}) is correct.
 @end itemize
 
 @subsubheading Check out the relevant modules:
12