* bootstrap: Use cp instead of ln -s, for systems without

symlinks.  Reorder the statements to avoid repetition outside
the loop.

diff --git a/ChangeLog b/ChangeLog
index 9e15f2ed480c300be22b472723c0ca6b5649cec9..3acb6d4ab5f9d015d9c59932dad0d3f51e05e94e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-28  Tim Van Holder  <tim.van.holder@pandora.be>, Gary V. Vaughan  <gary@gnu.org>
+
+       * bootstrap: Use cp instead of ln -s, for systems without
+       symlinks.  Reorder the statements to avoid repetition outside
+       the loop.
+
 2001-06-28  Paolo Bonzini  <bonzini@gnu.org>, Gary V. Vaughan  <gary@gnu.org>
 
        Libtool now builds with the help of Autoconf-2.50!

diff --git a/bootstrap b/bootstrap
index 961f2c2c3659a3afbd395677eaee227376ef48c5..da484b0cc0b55b2c6a89c3c4c2db9c6b5018c18f 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,37 +1,49 @@
 #! /bin/sh
 
 # helps bootstrapping libtool, when checked out from CVS
-# requires GNU autoconf and GNU automake
-
-file=Makefile.in
+# requires at least GNU autoconf 2.50 and GNU automake1.4-p4
 
 : ${ACLOCAL=aclocal}
 : ${AUTOMAKE=automake}
 : ${AUTOCONF=autoconf}
 : ${AUTOHEADER=autoheader}
 
-rm -f acinclude.m4
-ln -s libtool.m4 acinclude.m4
 # fake the libtool scripts
 touch ltmain.sh
-touch ltconfig
 touch libtoolize
-$ACLOCAL
-$AUTOMAKE --gnu --add-missing --copy
-$AUTOCONF
 
-for sub in libltdl demo depdemo mdemo cdemo tagdemo pdemo; do
+for sub in . libltdl demo depdemo mdemo cdemo tagdemo pdemo; do
+  case $sub in
+  .) 
+    top_srcdir=.
+    acfiles="$top_srcdir/libtool.m4"
+    AUTOMAKE_FLAGS="--gnu --add-missing --copy"
+    ;;
+  libltdl)
+    top_srcdir=..
+    acfiles="$top_srcdir/libtool.m4 $top_srcdir/ltdl.m4"
+    AUTOMAKE_FLAGS="--gnits --add-missing"
+    ;;
+  *)
+    top_srcdir=..
+    acfiles="$top_srcdir/libtool.m4"
+    AUTOMAKE_FLAGS="--gnits --add-missing"
+    ;;
+  esac
+
   cd $sub
   rm -f acinclude.m4 Makefile
-  cat ../libtool.m4 > acinclude.m4
-  test "$sub" = libltdl && cat ../ltdl.m4 >> acinclude.m4
+  for file in $acfiles; do
+    cat $file >> ./acinclude.m4
+  done
+
   $ACLOCAL
-  test "$sub" = libltdl && $AUTOHEADER
-  $AUTOMAKE --gnits --add-missing
+  test $sub = libltdl && $AUTOHEADER
+  eval $AUTOMAKE $AUTOMAKE_FLAGS
   $AUTOCONF
-  cd ..
+  cd $top_srcdir
 done
 
-rm -f ltmain.sh ltconfig libtoolize Makefile
+rm -f ltmain.sh libtoolize
 
 exit 0