From: Enrico Forestieri <forenr@lyx.org>
Date: Sun, 26 Aug 2018 13:02:59 +0000 (+0200)
Subject: Make Qt5 the default for building
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~3097
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a7ea98a30ac0cbf03b2804f6a9af937a6136bb52;p=lyx.git

Make Qt5 the default for building

Until now, building with Qt5 required using --enable-qt5.
This is no more necessary. To build with Qt4 one should now
use --disable-qt5 or, equivalently, --enable-qt5=no.
---

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 2c1a9af12a..b5ecb09817 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -63,14 +63,18 @@ AC_MSG_RESULT([$withval])
 ])
 
 
-dnl Check whether to configure for Qt5. Default is Qt4.
+dnl Check whether to configure for Qt4 or Qt5. Default is Qt5.
 dnl
 AC_DEFUN([LYX_CHECK_QT5],[
-AC_MSG_CHECKING([whether Qt5 is requested])
+AC_MSG_CHECKING([whether Qt5 is disabled])
 AC_ARG_ENABLE([qt5],
-  [  --enable-qt5            use Qt5 for building],
-  USE_QT5=$enableval, USE_QT5=no)
-AC_MSG_RESULT([$USE_QT5])
+  [  --disable-qt5           don't use Qt5 for building],
+  USE_QT5=$enableval, USE_QT5=yes)
+if test x$USE_QT5 != xno ; then
+  AC_MSG_RESULT([no])
+else
+  AC_MSG_RESULT([yes])
+fi
 AC_SUBST([USE_QT5])
 ])