summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rwxr-xr-xbin/bootstrap13
2 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7800975b7b1..2501520f8c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Mar 13 15:49:21 2003 Ossama Othman <ossama@uci.edu>
+
+ * bin/bootstrap:
+
+ Invoke `automake' after `autoheader' and `autoconf' to make sure
+ all configuration headers are generated prior to running
+ `automake'. Fixes an error about a missing `ace/config.h.in'
+ configuration header template file when running automake.
+ Thanks to Steve Huston <shuston@riverace.com> for reporting the
+ error, and providing a means to reproduce it.
+
Wed Mar 12 13:48:31 2003 Steve Huston <shuston@riverace.com>
* bin/bootstrap: Changed PAGER to be set using ${name:-value} instead
diff --git a/bin/bootstrap b/bin/bootstrap
index a2e5f4ca8cb..ea23da49608 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -75,13 +75,10 @@ if test -d m4; then
echo "Running aclocal"
aclocal -I m4
-# Make sure libtool support files are available.
- echo "Running libtool"
+ # Make sure libtool support files are available.
+ echo "Running libtoolize"
libtoolize --automake
- echo "Running automake"
- automake --add-missing
-
# Generate a `config.h.in' configuration header template from `acconfig.h'.
echo "Running autoheader"
autoheader -I m4
@@ -90,6 +87,12 @@ if test -d m4; then
echo "Running autoconf"
autoconf
+ # Invoke `automake' after `autoheader' so that all configuration
+ # headers are generate a priori.
+ echo "Running automake"
+ automake --add-missing
+
+
# # Generate the man pages.
# # Only generate man pages if bootstrapping a release.
# if test $bootstrap_release = yes; then