anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try with Qt4 when configuring for Qt5 fails

Browse Source 
This allows to avoid using --disable-qt5 when only the Qt4 libraries
are available.
This commit is contained in:
Enrico Forestieri 2018-08-27 16:31:51 +02:00
parent 9f99f3073a
commit 0cab640035
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
config/qt4.m4
View File

@ -56,8 +56,12 @@ AC_DEFUN([QT_CHECK_COMPILE],
]) ])
if test -z "$qt_cv_libname"; then if test -z "$qt_cv_libname"; then
AC_MSG_RESULT([failed]) if test x$USE_QT5 = xyes ; then
AC_MSG_ERROR([cannot compile a simple Qt executable. Check you have the right \$QTDIR.]) AC_MSG_RESULT([failed, retrying with Qt4])
else
AC_MSG_RESULT([failed])
AC_MSG_ERROR([cannot compile a simple Qt executable. Check you have the right \$QTDIR.])
fi
else else
AC_MSG_RESULT([$qt_cv_libname]) AC_MSG_RESULT([$qt_cv_libname])
fi fi
@ -170,7 +174,22 @@ AC_DEFUN([QT_DO_IT_ALL],
fi fi
if test -z "$QT_LIB"; then if test -z "$QT_LIB"; then
AC_MSG_ERROR([cannot find qt libraries.]) dnl Try again with Qt4 if configuring for Qt5 fails
if test x$USE_QT5 = xyes ; then
USE_QT5=no
AC_SUBST([USE_QT5])
if test -n "$PKG_CONFIG" ; then
QT_DO_PKG_CONFIG
fi
if test "$pkg_failed" != "no" ; then
QT_DO_MANUAL_CONFIG
fi
if test -z "$QT_LIB"; then
AC_MSG_ERROR([cannot find qt libraries.])
fi
else
AC_MSG_ERROR([cannot find qt libraries.])
fi
fi fi
dnl Check qt version dnl Check qt version