Given that "Debian unstable" ships with automake 1.4 by default and that 
"Debian testing" and "Debian stable" do the same, I'd like to propose the 
following patch to autogen.sh.

Ok?

Angus

Index: autogen.sh
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/autogen.sh,v
retrieving revision 1.54
diff -u -p -r1.54 autogen.sh
--- autogen.sh  26 May 2004 20:26:09 -0000      1.54
+++ autogen.sh  23 Feb 2005 13:08:14 -0000
@@ -6,12 +6,27 @@ AUTOMAKE="automake -a -c --foreign"
 AUTOCONF="autoconf"
 ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 
gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4"

+# Discover what version of automake we are using.
+automake_version=`$AUTOMAKE --version | head -n 1`
+echo "Using $automake_version"
+
+case $automake_version in
+    *' '1\.[5-7].*)
+       ;;
+    *)
+
+       echo "This automake version is not supported by LyX."
+       echo "LyX only supports automake 1.[5-7]."
+       exit
+       ;;
+esac
+
 # Discover what version of autoconf we are using.
 autoversion=`$AUTOCONF --version | head -n 1`
-
 echo "Using $autoversion"
+
 case $autoversion in
-    *2.5[2-9])
+    *' '2\.5[2-9])
        EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
        ;;
     *)

-- 
Angus

Reply via email to