war on lfhs continues ... what a mess

[citadel.git] / citadel / bootstrap

diff --git a/citadel/bootstrap b/citadel/bootstrap
index 330e137b012bd30619997b797906f9e2c8d7018f..354aed11092472e0a0fff49e1f41ef7708841072 100755 (executable)
--- a/citadel/bootstrap
+++ b/citadel/bootstrap
@@ -1,56 +1,33 @@
 #!/bin/sh
 #
-# run me after checking Citadel out of CVS.
-#
-# $Id$
-#
-
-# Remove any vestiges of pre-6.05 build environments
-rm -f .libs modules *.so *.lo *.la
-
-# Goofy red hat 7.3 stuff
-if grep 7.3 /etc/redhat-release >/dev/null 2>&1 ; then
-       redhat73=true
-else
-       redhat73=false
-fi
-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
+# run me after checking Citadel out of the source code repository.
 
 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
+
+grep '#define REV_LEVEL' citadel.h | sed 's/[^0-9]*//g' >package-version.txt
 
 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.