commit a7ea98a30ac0cbf03b2804f6a9af937a6136bb52
Author: Enrico Forestieri <for...@lyx.org>
Date: Sun Aug 26 15:02:59 2018 +0200
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.
---
config/lyxinclude.m4 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 2c1a9af..b5ecb09 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])
])
