* bootstrap.conf (gnulib_modules): Add autobuild.

* m4/autobuild.m4: Remove file.  Now, provided by gnulib.

diff --git a/ChangeLog b/ChangeLog
index 16768c2ecd6a6d5887e9605233fc70db4e5a0cd8..cebd70a15bf4f31b70ce85195e0c517a75c0de15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2007-04-25  Jim Meyering  <jim@meyering.net>
 
        * bootstrap.conf (gnulib_modules): Add fseeko and ftello.
+       (gnulib_modules): Add autobuild.
 
 2007-04-24  Jim Meyering  <jim@meyering.net>
 

diff --git a/bootstrap.conf b/bootstrap.conf
index 847e584731fe12df5b41902544663a6ae59b0083..1ed2978bb27627bbf5bae697ef1a1248662c3d44 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -38,7 +38,9 @@ obsolete_gnulib_modules='
 gnulib_modules="
        $avoided_gnulib_modules
        $obsolete_gnulib_modules
-       acl alloca announce-gen argmatch assert backupfile base64
+       acl alloca announce-gen argmatch assert
+       autobuild
+       backupfile base64
        c-strcase c-strtod
        c-strtold calloc canon-host canonicalize chown cloexec
        config-h configmake

diff --git a/m4/.cvsignore b/m4/.cvsignore
index 3522a36ef6487fb88cfb6aa05b259797cc0ee840..d8a1209e522027676e5006e0c9f4a172e9544dac 100644 (file)
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -7,6 +7,7 @@ argmatch.m4
 arpa_inet_h.m4
 assert.m4
 atexit.m4
+autobuild.m4
 backupfile.m4
 base64.m4
 bison.m4

diff --git a/m4/.gitignore b/m4/.gitignore
index 7069c4309029cffa90ce00785bd47bdb3935e112..0876685a63a5b29e457e02fa183647e0a5f04193 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -6,6 +6,7 @@ argmatch.m4
 arpa_inet_h.m4
 assert.m4
 atexit.m4
+autobuild.m4
 backupfile.m4
 base64.m4
 bison.m4

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 25cac3a2d912b09bdca5bc64b8b67e9aeaee7598..8b350dfec239f9ddd79d198c3b31eed5e72f61a4 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-25  Jim Meyering  <jim@meyering.net>
+
+       * autobuild.m4: Remove file.  Now, provided by gnulib.
+
 2007-01-19  Jim Meyering  <jim@meyering.net>
 
        * .cvsignore, .gitignore: Add more bootstrap-inserted file names.

diff --git a/m4/autobuild.m4 b/m4/autobuild.m4
deleted file mode 100644 (file)
index bb3407b..0000000
--- a/m4/autobuild.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-# autobuild.m4 serial 2 (autobuild-3.3)
-# Copyright (C) 2004, 2006 Simon Josefsson
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be used in projects which are not available under
-# the GNU General Public License or the GNU Library General Public
-# License but which still want to provide support for Autobuild.
-
-# Usage: AB_INIT([MODE]).
-AC_DEFUN([AB_INIT],
-[
-       AC_REQUIRE([AC_CANONICAL_BUILD])
-       AC_REQUIRE([AC_CANONICAL_HOST])
-
-       AC_MSG_NOTICE([autobuild project... ${PACKAGE_NAME:-$PACKAGE}])
-       AC_MSG_NOTICE([autobuild revision... ${PACKAGE_VERSION:-$VERSION}])
-       hostname=`hostname`
-       if test "$hostname"; then
-          AC_MSG_NOTICE([autobuild hostname... $hostname])
-       fi
-       ifelse([$1],[],,[AC_MSG_NOTICE([autobuild mode... $1])])
-       date=`date +%Y%m%d-%H%M%S`
-       if test "$?" != 0; then
-          date=`date`
-       fi
-       if test "$date"; then
-          AC_MSG_NOTICE([autobuild timestamp... $date])
-       fi
-])