X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fbootstrap;h=354aed11092472e0a0fff49e1f41ef7708841072;hb=7a65130ea2a5be56603233ba7b8d230691f604a0;hp=076c42ac60af383d63f606a1f4ad14fa28eb1ecc;hpb=d9b89d83e0b5273b8826e53ec6a96c83bfb328ee;p=citadel.git

diff --git a/citadel/bootstrap b/citadel/bootstrap
index 076c42ac6..354aed110 100755
--- a/citadel/bootstrap
+++ b/citadel/bootstrap
@@ -1,18 +1,34 @@
 #!/bin/sh
 #
-# run me after checking Citadel out of CVS.
-#
-aclocal
-libtoolize --force
+# run me after checking Citadel out of the source code repository.
+
+echo ... running aclocal ...
+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
+
+grep '#define REV_LEVEL' citadel.h | sed 's/[^0-9]*//g' >package-version.txt
+
 echo
-echo This script has been tested with autoconf 2.52, libtool 1.4.2, and
-echo automake 1.5. Other versions of automake will probably work, but I
-echo recommend the latest compatible versions of autoconf and libtool.
+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 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 Also note that autoconf and automake should be configured
+echo with the same prefix.
 echo