See ChangeLog: Mon Feb 22 20:04:00 CET 1999 Werner Koch

3 files changed, 37 insertions, 7 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index c14ea7298..612573a05 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 22 20:04:00 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* autogen.sh: Enhanced the version testing code (Philippe Laliberte)
+
+	* mkwebpage: Edits the buglist.
+
 Sat Feb 13 12:04:43 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* autogen.sh: Now uses gettextize
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 6d59f46cb..47a0f6604 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -4,21 +4,39 @@
 PGM=GnuPG
 DIE=no
 
+autoconf_vers=2.13
+automake_vers=1.4
+aclocal_vers=1.4
+
 if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then
-    :
+    if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \
+			       exit 1; exit 0; }');
+    then
+       echo "**Error**: "\`autoconf\'" is too old."
+       echo '           (version ' $autoconf_vers ' or newer is required)'
+       DIE="yes"
+    fi
 else
     echo
     echo "**Error**: You must have "\`autoconf\'" installed to compile $PGM."
-    echo '           (version 2.13 or newer is required)'
+    echo '           (version ' $autoconf_vers ' or newer is required)'
     DIE="yes"
 fi
 
 if (automake --version) < /dev/null > /dev/null 2>&1 ; then
+  if (automake --version | awk 'NR==1 { if( $4 >= '$automake_vers') \
+			     exit 1; exit 0; }');
+     then
+     echo "**Error**: "\`automake\'" is too old."
+     echo '           (version ' $automake_vers ' or newer is required)'
+     DIE="yes"
+  fi
   if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-    if (aclocal --version | awk 'NR==1 { if( $4 >= 1.4 ) exit 1; exit 0; }');
+    if (aclocal --version | awk 'NR==1 { if( $4 >= '$aclocal_vers' ) \
+						exit 1; exit 0; }' );
     then
       echo "**Error**: "\`aclocal\'" is too old."
-      echo '           (version 1.4 or newer is required)'
+      echo '           (version ' $aclocal_vers ' or newer is required)'
       DIE="yes"
     fi
   else
@@ -27,11 +45,10 @@ if (automake --version) < /dev/null > /dev/null 2>&1 ; then
     echo "           installed doesn't appear recent enough."
     DIE="yes"
   fi
-
 else
     echo
     echo "**Error**: You must have "\`automake\'" installed to compile $PGM."
-    echo '           (version 1.3 or newer is required)'
+    echo '           (version ' $automake_vers ' or newer is required)'
     DIE="yes"
 fi
 
@@ -41,7 +58,8 @@ if (gettext --version </dev/null 2>/dev/null | awk 'NR==1 { split($4,A,"\."); \
     then
     echo "**Error**: You must have "\`gettext\'" installed to compile $PGM."
     echo '           (version 0.10.35 or newer is required; get'
-    echo '            ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz)'
+    echo '            ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz'
+    echo '            or install the latest Debian package)'
     DIE="yes"
 fi
 
diff --git a/scripts/mkwebpage b/scripts/mkwebpage
index 769b15623..e386bdff7 100755
--- a/scripts/mkwebpage
+++ b/scripts/mkwebpage
@@ -21,9 +21,15 @@ fix_it () {
 
 EOF
     cvs -Q checkout -p gnupg/NEWS >>$dir/NEWS
+    cvs -Q checkout -p gnupg/BUGS >>$dir/BUGS
     here=`pwd`
     cd $dir
     ln -sf gnupg.html index.html
+    sed -n '1,/@BEGIN_BUGLIST@/ p' buglist.html       >buglist.tmp
+    sed    '1,/^~~~~~~~~~~~/ d'  BUGS                >>buglist.tmp
+    echo "(List generated from CVS: " `date -R` ")"  >>buglist.tmp
+    sed -n '/@END_BUGLIST@/,$ p'   buglist.html      >>buglist.tmp
+    mv	buglist.tmp buglist.html
     cd $here
 }