anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-28 20:45:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make Qt5 the default for building

Browse Source 
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.
This commit is contained in:
Enrico Forestieri 2018-08-26 15:02:59 +02:00
parent af42dfedf6
commit a7ea98a30a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/lyxinclude.m4
View File

@ -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 dnl
AC_DEFUN([LYX_CHECK_QT5],[ AC_DEFUN([LYX_CHECK_QT5],[
AC_MSG_CHECKING([whether Qt5 is requested]) AC_MSG_CHECKING([whether Qt5 is disabled])
AC_ARG_ENABLE([qt5], AC_ARG_ENABLE([qt5],
[ --enable-qt5 use Qt5 for building], [ --disable-qt5 don't use Qt5 for building],
USE_QT5=$enableval, USE_QT5=no) USE_QT5=$enableval, USE_QT5=yes)
AC_MSG_RESULT([$USE_QT5]) if test x$USE_QT5 != xno ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
fi
AC_SUBST([USE_QT5]) AC_SUBST([USE_QT5])
]) ])