* bootstrap: Need to generate tests/package.m4 from Makefile.am

before generating tests/testsuite from tests/Makefile.am, or
else bootstrap of a fresh checkout fails.

diff --git a/ChangeLog b/ChangeLog
index 7c85665b9201413e3637ef1d8c8d8d9cf9a67b2d..d23e7b36e25a72636cae88ed530942e0eb993dc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-15  Gary V. Vaughan  <gary@gnu.org>
+
+       * bootstrap: Need to generate tests/package.m4 from Makefile.am
+       before generating tests/testsuite from tests/Makefile.am, or
+       else bootstrap of a fresh checkout fails.
+
 2005-03-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * m4/libtool.m4 (_LT_COPYING): Update Copyright year.

diff --git a/bootstrap b/bootstrap
index 0a7cc1ef1a296f9088c7ba68b714c4324c94065e..044f1969d7221241e4d6865585af4073f6fda0a6 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 # bootstrap -- Helps bootstrapping libtool, when checked out from CVS.
 #
-# Copyright (C) 2003, 2004 Free Software Foundation
+# Copyright (C) 2003, 2004, 2005 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
@@ -70,12 +70,15 @@ done
 rm -f ./config/ltmain.sh ./m4/ltversion.m4
 
 make ./config/ltmain.sh ./m4/ltversion.m4 ./libtoolize.in ./tests/defs.in \
-    top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="autom4te --language=m4sh"
+    srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" \
+    M4SH="autom4te --language=m4sh"
 
 {
+  make update-package-m4 srcdir=. top_srcdir=. \
+    PACKAGE="$2" VERSION="$3" PACKAGE_BUGREPORT="bug-$2@gnu.org"
   cd tests
   make ./testsuite AUTOTEST="autom4te --language=autotest" \
-    top_srcdir=.. PACKAGE="$2" VERSION="$3" PACKAGE_BUGREPORT="bug-$2@gnu.org"
+    srcdir=. top_srcdir=.. top_builddir=..  PACKAGE="$2" VERSION="$3"
   cd ..
 }