Improve error message

[lyx.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 5e75f612b4877d4c38cc1c5190f8de9e2f0ab44e..d19159fb6e332431cf2478af04c0faf0d5d136e6 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Quick compilation guide
 
 These four steps will compile, test and install LyX:
 
 
 These four steps will compile, test and install LyX:
 

-       0) Linux users beware: You need qt4 and qt4-devel packages
+       0) Linux users beware: You need qt5 and qt5-devel packages

           of the same version to compile LyX.
 
           In general, it is also recommended to have pkg-config
           of the same version to compile LyX.
 
           In general, it is also recommended to have pkg-config


@@ -15,7 +15,7 @@ These four steps will compile, test and install LyX:
 
        1) ./configure configures LyX according to your system. You
           may have to set --with-qt-dir=<path-to-your-qt-installation>
 
        1) ./configure configures LyX according to your system. You
           may have to set --with-qt-dir=<path-to-your-qt-installation>

-          (for example, "--with-qt-dir=/usr/share/qt4/") if the
+          (for example, "--with-qt-dir=/usr/share/qt5/") if the

           environment variable QTDIR is not set and pkg-config is not
           available.
 
           environment variable QTDIR is not set and pkg-config is not
           available.
 


@@ -36,8 +36,8 @@ Note for Git checkouts
 -----------------------------
 
 If you have checked this out from Git, you need to have:
 -----------------------------
 
 If you have checked this out from Git, you need to have:

-* automake (supported versions are 1.8--1.15)
-* autoconf (supported versions are 2.60--2.69)
+* automake (supported versions are 1.14--1.16)
+* autoconf (supported versions are 2.65--2.69)

 Then type "./autogen.sh" to build the needed configuration
 files and proceed as stated above/below.
 
 Then type "./autogen.sh" to build the needed configuration
 files and proceed as stated above/below.
 


@@ -117,8 +117,11 @@ flags:
 
     The `gprof' build type compiles and links with -pg option with gcc.
 
 
     The `gprof' build type compiles and links with -pg option with gcc.
 

-  o --with-extra-lib=DIRECTORY that specifies the path where LyX will
-    find extra libraries (qt4) it needs. Defaults to NONE
+o --disable-qt5 that forces configuration with Qt 4.x when Qt 5.x is
+    also available. By default Qt5 is tried first, and then Qt4.
+
+o --with-extra-lib=DIRECTORY that specifies the path where LyX will
+    find extra libraries (like Qt) it needs. Defaults to NONE

     (i.e. search in standard places). You can specify several
     directories, separated by colons.
 
     (i.e. search in standard places). You can specify several
     directories, separated by colons.
 


@@ -227,11 +230,10 @@ The following options allow you to tweak the generated code more precisely (see
     --without-included-boost is specified). You may have to use
     --disable-stdlib-debug when linking development versions against
     your system's boost library.
     --without-included-boost is specified). You may have to use
     --disable-stdlib-debug when linking development versions against
     your system's boost library.

+    The same problem applies to hunspell (as of hunspell 1.5). So either
+    compile --with-included-hunspell or --disable-stdlib-debug when
+    linking development versions against your system's hunspell library.

 
 

-  o --enable-monolithic-build[=boost,client,insets,mathed,core,tex2lyx,frontend-qt4]
-    that enables monolithic build of the given parts of the source
-    code. This should reduce the compilation time provided you have
-    enough memory (>500MB).

 
 
 Compiling and installing LyX
 
 
 Compiling and installing LyX