Changes to m4/bootstrap,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      07/07/10 20:48:11

Index: bootstrap
===================================================================
RCS file: /sources/m4/m4/bootstrap,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- bootstrap   1 Jul 2007 19:49:41 -0000       1.46
+++ bootstrap   10 Jul 2007 20:48:07 -0000      1.47
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2007-03-24
+# bootstrap (GNU M4) version 2007-07-10
 # Written by Gary V. Vaughan  <address@hidden>
 
 # Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -9,7 +9,7 @@
 
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -186,6 +186,18 @@
      exit $EXIT_SUCCESS
 }
 
+# func_update
+# Copy $1 to $2 if it is newer.
+func_update ()
+{
+  if test -f "$2" && cmp -s "$1" "$2" ; then
+    func_verbose "$2 is up-to-date"
+  else
+    func_echo "copying $1 -> $2"
+    cp "$1" "$2"
+  fi
+}
+
 # Parse options once, thoroughly.  This comes as soon as possible in
 # the script to make things like `commit --version' happen quickly.
 {
@@ -456,6 +468,21 @@
 AUTOPOINT=true $AUTORECONF --force --verbose --install --no-recursive
 
 
+## ---------------------------------------- ##
+## Gnulib is more up-to-date than automake. ##
+## ---------------------------------------- ##
+
+func_update "$gnulibdir"/build-aux/config.guess $config_aux_dir/config.guess
+func_update "$gnulibdir"/build-aux/config.sub $config_aux_dir/config.sub
+func_update "$gnulibdir"/build-aux/depcomp $config_aux_dir/depcomp
+func_update "$gnulibdir"/build-aux/install-sh $config_aux_dir/install-sh
+func_update "$gnulibdir"/build-aux/mdate-sh $config_aux_dir/mdate-sh
+func_update "$gnulibdir"/build-aux/missing $config_aux_dir/missing
+func_update "$gnulibdir"/build-aux/texinfo.tex $config_aux_dir/texinfo.tex
+func_update "$gnulibdir"/doc/COPYINGv3 COPYING
+func_update "$gnulibdir"/doc/INSTALL INSTALL
+
+
 ## ------- ##
 ## Wrapup. ##
 ## ------- ##