* cs.po

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 306ffe85524894003bd8e72a3df3ac86d1b4c3e3..f53f243df09042f586797429941a30292014727d 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -4,7 +4,8 @@ AC_DEFUN([QT_TRY_LINK],
        SAVE_LIBS="$LIBS"
        LIBS="$LIBS $1"
        AC_TRY_LINK([
-       #include <QtCore/QString>
+       #include <qglobal.h>
+       #include <qstring.h>
                ],
        [
        QString s("mangle_failure");
@@ -103,7 +104,7 @@ AC_DEFUN([QT_GET_VERSION],
                cat > conftest.$ac_ext <<EOF
 #line __oline__ "configure"
 #include "confdefs.h"
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 "%%%"QT_VERSION_STR"%%%"
 EOF
                lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
@@ -192,7 +193,7 @@ AC_DEFUN([QT_DO_IT_ALL],
            [AC_MSG_RESULT(no)])
        else
          AC_PREPROC_IFELSE([AC_LANG_SOURCE([
-           [#include <QtCore/qglobal.h>],
+           [#include <qglobal.h>],
            [#ifndef Q_WS_X11],
            [#error Fail],
            [#endif]])],
@@ -210,7 +211,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