* Fix bootstrap for Red Hat 7.3

diff --git a/citadel/.cvsignore b/citadel/.cvsignore
index 910af142fe6e51a4116c12afd9b8575e26021538..9337fa801476187889b48407b762b871210e5a2b 100644 (file)
--- a/citadel/.cvsignore
+++ b/citadel/.cvsignore
@@ -9,6 +9,7 @@ Makefile
 aclocal.m4
 aidepost
 autom4te.cache
+autom4te-2.53.cache
 base64
 chkpwd
 citadel

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 9b6ea2bcc7357112ea96a83a184c50234cb16c8a..f66a017b3c050db65aec6664ae0a8a0c47237a79 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.17  2002/10/04 07:11:56  error
+ * Fix bootstrap for Red Hat 7.3
+
  Revision 601.16  2002/10/02 04:07:27  error
  * status_line() now shows "new mail" only when there is new mail
 
@@ -4043,3 +4046,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/bootstrap b/citadel/bootstrap
index f4195af365abf50cc882499f223b00323baffbf2..4511cb5f4e983869a3240ba216fa5f40b128e091 100755 (executable)
--- a/citadel/bootstrap
+++ b/citadel/bootstrap
@@ -4,14 +4,39 @@
 #
 # $Id$
 #
+
+# 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
+
 echo ... running aclocal ...
-aclocal
+$aclocal
 echo ... running libtoolize ...
 libtoolize -c --force
 echo ... running autoconf ...
-autoconf
+$autoconf
 echo ... running autoheader ...
-autoheader
+$autoheader
 
 echo
 echo This script has been tested with autoconf 2.53, libtool 1.4d, and