Re: use build-aux

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 11/6/2007 6:15 AM:
> According to Ralf Wildenhues on 11/6/2007 4:31 AM:
>> You need to ensure build-aux/mkstamp exists at the end of the bootstrap.
>> You could copy it from ltdl/config/.
> 
> Or is there a better way to make libtool share build-aux, rather than
> creating its own subdirectory?  Perhaps using the libtoolize
> --nonrecursive or --recursive option?

Nevermind.  I see that I missed a file; I wrote the above thinking that
mkstamp belonged to libtool, but see now that it belongs to m4.  Applying:

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHMGyB84KuGfSFAYARAoxiAJ40XZkEKeoJTHvCPXG0zGU0wJfxSwCeIy7u
pnxMgTJXNB0uLUnzc921OdA=
=lZ0d
-----END PGP SIGNATURE-----

>From 5318dab180e2d652f64f928a405ede32539c7f57 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 6 Nov 2007 06:29:27 -0700
Subject: [PATCH] * build-aux/mkstamp: Rename from ltdl/config/mkstamp.

Signed-off-by: Eric Blake <address@hidden>
---
 .cvsignore             |    1 -
 .gitignore             |    1 -
 ChangeLog              |    2 ++
 build-aux/.cvsignore   |   12 ++++++++++++
 build-aux/.gitignore   |   12 ++++++++++++
 build-aux/mkstamp      |   38 ++++++++++++++++++++++++++++++++++++++
 ltdl/.cvsignore        |    1 +
 ltdl/.gitignore        |    1 +
 ltdl/config/.cvsignore |   12 ------------
 ltdl/config/.gitignore |   12 ------------
 ltdl/config/mkstamp    |   38 --------------------------------------
 11 files changed, 66 insertions(+), 64 deletions(-)
 create mode 100644 build-aux/.cvsignore
 create mode 100644 build-aux/.gitignore
 create mode 100755 build-aux/mkstamp
 delete mode 100644 ltdl/config/.cvsignore
 delete mode 100644 ltdl/config/.gitignore
 delete mode 100755 ltdl/config/mkstamp

diff --git a/.cvsignore b/.cvsignore
index f36af79..1b25efa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,7 +4,6 @@ ABOUT-NLS
 aclocal.m4
 aclocal.m4t
 autom4te.cache
-build-aux
 config.cache
 config.h
 config-h.in
diff --git a/.gitignore b/.gitignore
index 21bfd60..ed1f298 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ ABOUT-NLS
 aclocal.m4
 aclocal.m4t
 autom4te.cache
-build-aux
 config.cache
 config.h
 config-h.in
diff --git a/ChangeLog b/ChangeLog
index 0a986c6..d7be92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-11-06  Eric Blake  <address@hidden>
 
+       * build-aux/mkstamp: Rename from ltdl/config/mkstamp.
+
        * Makefile.am (tests/package.m4): Work around bash bug.
        Reported by Ralf Wildenhues.
 
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
new file mode 100644
index 0000000..3a8e904
--- /dev/null
+++ b/build-aux/.cvsignore
@@ -0,0 +1,12 @@
+compile
+config.*
+depcomp
+gendocs.sh
+gnupload
+install-sh
+link-warning.h
+ltmain.sh
+mdate-sh
+missing
+mkinstalldirs
+texinfo.tex
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
new file mode 100644
index 0000000..3a8e904
--- /dev/null
+++ b/build-aux/.gitignore
@@ -0,0 +1,12 @@
+compile
+config.*
+depcomp
+gendocs.sh
+gnupload
+install-sh
+link-warning.h
+ltmain.sh
+mdate-sh
+missing
+mkinstalldirs
+texinfo.tex
diff --git a/build-aux/mkstamp b/build-aux/mkstamp
new file mode 100755
index 0000000..3e81c96
--- /dev/null
+++ b/build-aux/mkstamp
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+# mkstamp - extract data from Revision and Date RCS tags in a file
+# Copyright (C) 1999, 2003, 2007 Free Software Foundation, Inc.
+# Alexandre Oliva <address@hidden>
+#
+# This file is part of GNU M4.
+#
+# GNU M4 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 3 of the License, or
+# (at your option) any later version.
+#
+# GNU M4 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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, 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
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This script expects to find a line containing both Revision and Date
+# tags, and it edits this line so that it looks like ` $rev $date'
+
+# Command-line arguments are passed down to sed; additional -e cmd
+# arguments are acceptable.  If no input filename is specified in the
+# command line, sed will read from stdin.
+
+exec sed -e '
+       s%.*\$''Revision: \([^$]*\) \$.*\$''Date: \([^$]*\) \$.*% \1 \2%
+       t end
+       d
+       : end' ${1+"$@"}
diff --git a/ltdl/.cvsignore b/ltdl/.cvsignore
index e2af3df..aec0bad 100644
--- a/ltdl/.cvsignore
+++ b/ltdl/.cvsignore
@@ -8,6 +8,7 @@ argz.c
 argz_.h
 argz.h
 autom4te.cache
+config
 config-h.in
 config.*
 configure
diff --git a/ltdl/.gitignore b/ltdl/.gitignore
index e2af3df..aec0bad 100644
--- a/ltdl/.gitignore
+++ b/ltdl/.gitignore
@@ -8,6 +8,7 @@ argz.c
 argz_.h
 argz.h
 autom4te.cache
+config
 config-h.in
 config.*
 configure
diff --git a/ltdl/config/.cvsignore b/ltdl/config/.cvsignore
deleted file mode 100644
index 3a8e904..0000000
--- a/ltdl/config/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-compile
-config.*
-depcomp
-gendocs.sh
-gnupload
-install-sh
-link-warning.h
-ltmain.sh
-mdate-sh
-missing
-mkinstalldirs
-texinfo.tex
diff --git a/ltdl/config/.gitignore b/ltdl/config/.gitignore
deleted file mode 100644
index 3a8e904..0000000
--- a/ltdl/config/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-compile
-config.*
-depcomp
-gendocs.sh
-gnupload
-install-sh
-link-warning.h
-ltmain.sh
-mdate-sh
-missing
-mkinstalldirs
-texinfo.tex
diff --git a/ltdl/config/mkstamp b/ltdl/config/mkstamp
deleted file mode 100755
index 3e81c96..0000000
--- a/ltdl/config/mkstamp
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-# mkstamp - extract data from Revision and Date RCS tags in a file
-# Copyright (C) 1999, 2003, 2007 Free Software Foundation, Inc.
-# Alexandre Oliva <address@hidden>
-#
-# This file is part of GNU M4.
-#
-# GNU M4 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 3 of the License, or
-# (at your option) any later version.
-#
-# GNU M4 is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# 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, 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
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This script expects to find a line containing both Revision and Date
-# tags, and it edits this line so that it looks like ` $rev $date'
-
-# Command-line arguments are passed down to sed; additional -e cmd
-# arguments are acceptable.  If no input filename is specified in the
-# command line, sed will read from stdin.
-
-exec sed -e '
-       s%.*\$''Revision: \([^$]*\) \$.*\$''Date: \([^$]*\) \$.*% \1 \2%
-       t end
-       d
-       : end' ${1+"$@"}
-- 
1.5.3.2