X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fbootstrap;h=636a4b1687313a320736e6cdd3aac72894acc1a4;hb=55013f95f08eafe1b375df4241e8defe387c6cdc;hp=c6910888fbd1de7d740bb5e7359e9e398f70dd5b;hpb=64b4432d2cf2d6a2ae0a50d1d06b2e31bc9f0a5a;p=citadel.git

diff --git a/citadel/bootstrap b/citadel/bootstrap
index c6910888f..636a4b168 100755
--- a/citadel/bootstrap
+++ b/citadel/bootstrap
@@ -1,45 +1,34 @@
 #!/bin/sh
 #
-# run me after checking Citadel out of CVS.
-#
-# $Id$
-#
+# run me after checking Citadel out of the source code repository.
 
-# Goofy red hat 7.3 stuff
-[ `cut -f 5 -d ' ' /etc/redhat-release` = 7.3 ] && redhat73=true
-if [ "$redhat73" = "true" ]; then
-	aclocal=/usr/bin/aclocal-1.5
-	autoconf=/usr/bin/autoconf-2.53
-	autoheader=/usr/bin/autoheader-2.53
-
-	if test -z $aclocal ; then
-		echo "Please install the automake15 RPM package"
-		redhat73=missing
-	fi
-	if test -z $autoconf || test -z $autoheader ; then
-		echo "Please install the autoconf253 RPM package"
-		redhat73=missing
-	fi
-	if test "$redhat73" = "missing" ; then
-		exit 1
-	fi
-else
-	aclocal=aclocal
-	autoconf=autoconf
-	autoheader=autoheader
-fi
+# Remove any vestiges of pre-6.05 build environments
+rm -f .libs modules *.so *.lo *.la 2>/dev/null
 
 echo ... running aclocal ...
-$aclocal
+aclocal  -I m4
+
 echo ... running autoconf ...
-$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
+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.53 and
-echo automake 1.5. Other versions may work, but I recommend the latest
-echo compatible versions of these.
+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 and automake should be configured
 echo with the same prefix.