X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fqt4.m4;h=75abd3360a18379ddfb59b00eaf286a50f05c325;hb=54147a7140cbb053711dd9f2cf15763b0943659e;hp=1cf557d637239bd9ce3fb0df98904c9e283fde6b;hpb=e8d8f0abf8245ccf91eb2606a215c63627aa5da8;p=lyx.git diff --git a/config/qt4.m4 b/config/qt4.m4 index 1cf557d637..75abd3360a 100644 --- a/config/qt4.m4 +++ b/config/qt4.m4 @@ -56,8 +56,12 @@ AC_DEFUN([QT_CHECK_COMPILE], ]) if test -z "$qt_cv_libname"; then - AC_MSG_RESULT([failed]) - AC_MSG_ERROR([cannot compile a simple Qt executable. Check you have the right \$QTDIR.]) + if test x$USE_QT5 = xyes ; then + 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 AC_MSG_RESULT([$qt_cv_libname]) fi @@ -170,7 +174,22 @@ AC_DEFUN([QT_DO_IT_ALL], fi 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 dnl Check qt version @@ -211,7 +230,7 @@ AC_DEFUN([QT_DO_IT_ALL], QT_FIND_TOOL([QT_RCC], [rcc]) dnl Safety check - mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]\.[[0-9]]\).*/\1/'` + mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]\).*/\1/'` if test "x$mocqtver" != "x$QTLIB_VERSION"; then LYX_WARNING([The found moc compiler is for Qt $mocqtver but the Qt library version is $QTLIB_VERSION.]) fi