X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=INSTALL;h=d19159fb6e332431cf2478af04c0faf0d5d136e6;hb=59d73f52b8afa734c02db08b075c1cdaf25611c1;hp=2addec519e069702c2056db260eb6fcd5580b508;hpb=8adba3896ce3fa0402ea719ce85140ef6cbdaa1a;p=lyx.git

diff --git a/INSTALL b/INSTALL
index 2addec519e..d19159fb6e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,7 +36,7 @@ Note for Git checkouts
 -----------------------------
 
 If you have checked this out from Git, you need to have:
-* automake (supported versions are 1.14--1.15)
+* 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.
@@ -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