X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fbootstrap;h=636a4b1687313a320736e6cdd3aac72894acc1a4;hb=08932aebd49f355220da46a3e1ea58d569e46a95;hp=faf3acc0e09038563fa31556694cdc662d3d10d1;hpb=1f5e183c0f44238e59e78b1cbba783ac70bc5bc8;p=citadel.git

diff --git a/citadel/bootstrap b/citadel/bootstrap
index faf3acc0e..636a4b168 100755
--- a/citadel/bootstrap
+++ b/citadel/bootstrap
@@ -1,27 +1,35 @@
 #!/bin/sh
 #
-# run me after checking Citadel out of CVS.
-#
-# $Id$
-#
+# run me after checking Citadel out of the source code repository.
+
+# Remove any vestiges of pre-6.05 build environments
+rm -f .libs modules *.so *.lo *.la 2>/dev/null
+
 echo ... running aclocal ...
-aclocal
-echo ... running libtoolize ...
-libtoolize --force
+aclocal  -I m4
+
 echo ... running autoconf ...
 autoconf
+
+# If your autoconf version changes, the autom4te.cache stuff will mess you up.
+# Get rid of it.
+echo ... removing autoheader cache files ...
+rm -rf autom4te*.cache
+
 echo ... running autoheader ...
 autoheader
 
+echo ... running mk_svn_revision.sh ...
+./scripts/mk_svn_revision.sh
+
+echo ... running mk_module_init.sh ...
+./scripts/mk_module_init.sh
+
 echo
-echo This script has been tested with autoconf 2.52, libtool 1.4.2, and
-echo automake 1.5. Other versions may work, but I recommend the latest
-echo compatible versions of these.
-echo
-echo Some versions of libtool may have outputted, above, a spurious warning
-echo that you have to regenerate your aclocal.m4. This is a mostly harmless bug
-echo and can be ignored.
+echo This script has been tested with autoconf 2.53 and
+echo automake 1.5. Other versions may work, but we recommend
+echo the latest echo compatible versions of these.
 echo
-echo Also note that autoconf, automake, and libtool should all be configured
+echo Also note that autoconf and automake should be configured
 echo with the same prefix.
 echo