X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=INSTALL;h=d19159fb6e332431cf2478af04c0faf0d5d136e6;hb=71fe3282077d572aabcc6b76639476ab2d6ca151;hp=a3cf93e7699673911ca698d2e90ea6ee97c244d0;hpb=36099dce44d8cb11acc1b9c15c7222c458490779;p=lyx.git

diff --git a/INSTALL b/INSTALL
index a3cf93e769..d19159fb6e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Quick compilation guide
 
 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
@@ -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>
-	   (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.
 
@@ -36,8 +36,8 @@ Note for Git checkouts
 -----------------------------
 
 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.
 
@@ -49,7 +49,7 @@ Requirements
 
 First of all, you will need a recent C++ compiler, where recent means
 that the compilers are close to C++11 standard conforming like gcc (at
-least 4.3) or clang.
+least 4.6) or clang.
 
 LyX makes great use of the C++ Standard Template Library (STL).
 This means that gcc users will have to install the relevant libstdc++
@@ -117,8 +117,11 @@ flags:
 
     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.
 
@@ -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.
+    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