Jean-Marc Lasgouttes wrote:
> Angus> Given that "Debian unstable" ships with automake 1.4 by default
> Angus> and that "Debian testing" and "Debian stable" do the same, I'd
> Angus> like to propose the following patch to autogen.sh.
>
> It seems reasonable.
>
> Angus> +case $automake_version in + *' '1\.[5-7].*) + ;; + *)
>
> Are you sure you need the "\."? This is globbing, not regexps.
>
> Also, update INSTALL to explain the requirement. AFAIK they are
>
> autoconf 2.5x
> automake >= 1.5
> gettext >=0.12
>
> If you feel like it, you could also update the part about gcc version :)
>
> JMarc
Updated patch attached. I've documented INSTALL and check for gettext and
automake in autogen.sh
--
Angus
Index: INSTALL
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/INSTALL,v
retrieving revision 1.60
diff -u -p -r1.60 INSTALL
--- INSTALL 26 Oct 2004 21:16:41 -0000 1.60
+++ INSTALL 23 Feb 2005 14:41:47 -0000
@@ -29,9 +29,11 @@ These four steps will compile, test and
Note for CVS checkouts
----------------------
-If you have checked this out from CVS, you need to have
-automake, autoconf, and gettext installed. Then,
-type "./autogen.sh" to build the needed configuration
+If you have checked this out from CVS, you need to have:
+* automake >= 1.5
+* autoconf >= 2.52
+* gettext >= 0.12
+Then type "./autogen.sh" to build the needed configuration
files and proceed as stated below.
You will also probably need GNU m4 (perhaps installed as gm4).
@@ -41,16 +43,17 @@ Requirements
First of all, you will also need a recent C++ compiler, where recent
means that the compilers are close to C++ standard conforming.
-Compilers that are known to compile LyX are egcs 1.1.x, gcc 2.95.x and
-later, and Digital C++ version 6.1 and later. Please tell us your
-experience with other compilers. It is _not_ possible to compile LyX
-with gcc 2.7.x and 2.8.x, and this is not likely to change in the
-future.
+Compilers that are known to compile LyX are gcc 2.95.x and later
+and Digital C++ version 6.1 and later. Please tell us your experience
+with other compilers.
-Note that, contrary to LyX 1.0.x, LyX 1.3.x makes great use of C++
-Standard Template Library (STL); this means that gcc users will have
-to install the relevant libstdc++ library to be able to compile this
-version.
+It is _not_ possible to compile LyX with gcc 2.7.x and 2.8.x.
+
+LyX 1.4.x makes great use of C++ Standard Template Library (STL).
+This means that gcc users will have to install the relevant libstdc++
+library to be able to compile this version of LyX. Users of gcc 2.95.x
+will have to install the STLPort version of these libraries as the
+ones that come with gcc 2.95.x are too broken for us to use.
* xforms frontend
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 14:41:47 -0000
@@ -6,12 +6,59 @@ 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 gettext we are using.
+gettext_version=`gettext --version 2>/dev/null | head -n 1`
+
+test "$gettext_version" != "" && {
+ echo "Using $gettext_version"
+} || {
+ echo "LyX requires getttext >= 0.12"
+ exit
+}
+
+case $gettext_version in
+ *' '0.1[2-4]*)
+ ;;
+ *)
+ echo "This gettext version is not supported by LyX."
+ echo "LyX supports only gettext 0.1[2-4]."
+ exit
+ ;;
+esac
+
+# Discover what version of automake we are using.
+automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
+
+test "$automake_version" != "" && {
+ echo "Using $automake_version"
+} || {
+ echo "LyX requires automake >= 1.5"
+ exit
+}
+
+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`
+autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
-echo "Using $autoversion"
+test "$autoversion" != "" && {
+ echo "Using $autoversion"
+} || {
+ echo "LyX requires autoconf >= 2.52"
+ exit
+}
+
case $autoversion in
- *2.5[2-9])
+ *' '2.5[2-9])
EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
;;
*)
