Update sk.po

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index aa94ae9d029abf63be95bccd8a6e8f527497da0f..f53f243df09042f586797429941a30292014727d 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -32,7 +32,7 @@ AC_DEFUN([QT_CHECK_COMPILE],
                qt_guilibs="'-lQtCore -lQtGui' '-lQtCore4 -lQtGui4'"
                if test $USE_QT5 = "yes" ; then
                    qt_corelibs="-lQt5Core"
-                   qt_guilibs="-lQt5Core -lQt5Concurrent -lQt5Gui -lQt5Widgets"
+                   qt_guilibs="-lQt5Core -lQt5Concurrent -lQt5Gui -lQt5Svg -lQt5Widgets"
                fi
                for libname in $qt_corelibs '-framework QtCore'
                do
@@ -44,7 +44,7 @@ AC_DEFUN([QT_CHECK_COMPILE],
                done
                qt_cv_libname=
                for libname in $qt_guilibs \
-                              '-framework QtCore -framework QtConcurrent -framework QtWidgets -framework QtMacExtras -framework QtGui'\
+                              '-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtWidgets -framework QtMacExtras -framework QtGui'\
                               '-framework QtCore -framework QtGui'
                do
                        QT_TRY_LINK($libname)
@@ -71,11 +71,20 @@ AC_DEFUN([QT_FIND_TOOL],
        if test "x$USE_QT5" != "xno" ; then
                qt_ext=qt5
        fi
+
        if test -n "$qt_cv_bin" ; then
                AC_PATH_PROGS($1, [$2], [], $qt_cv_bin)
+       elif qtchooser -l 2>/dev/null | grep -q ^$qt_ext\$ >/dev/null ; then
+               AC_PATH_PROG(qtc_path, qtchooser, [], [$PATH])
+               AC_PATH_PROG($2_path, $2, [], [$PATH])
+               qtc_path=`dirname "$qtc_path"`
+               $2_path=`dirname "$$2_path"`
+               if test "$qtc_path" = "$$2_path" ; then
+                       AC_CHECK_PROG($1, $2, [$2 -qt=$qt_ext],, [$PATH])
+               fi
        fi
        if test -z "$$1"; then
-               AC_PATH_PROGS($1, [$2-$qt_ext $2],[],$PATH)
+               AC_CHECK_PROGS($1, [$2-$qt_ext $2],[],$PATH)
        fi
        if test -z "$$1"; then
                AC_MSG_ERROR([cannot find $2 binary.])
@@ -112,14 +121,6 @@ EOF
 dnl start here
 AC_DEFUN([QT_DO_IT_ALL],
 [
-       AC_MSG_CHECKING([whether Qt5 is requested])
-       dnl Default is Qt4
-       AC_ARG_ENABLE([qt5],
-         [  --enable-qt5            use Qt5 for building],
-         USE_QT5=$enableval, USE_QT5=no)
-       AC_MSG_RESULT([$USE_QT5])
-       AC_SUBST([USE_QT5])
-
        dnl this variable is precious
        AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt4])
 
@@ -177,12 +178,40 @@ AC_DEFUN([QT_DO_IT_ALL],
        [AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QTLIB_VERSION has been found.])
        ])
 
+       save_CPPFLAGS=$CPPFLAGS
+       CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES"
+       AC_CHECK_HEADER(QtGui/qtgui-config.h,
+         [lyx_qt5_config=QtGui/qtgui-config.h],
+         [lyx_qt5_config=qconfig.h],[-])
+       AC_MSG_CHECKING([whether Qt uses the X Window system])
+       if test x$USE_QT5 = xyes ; then
+         AC_EGREP_CPP(xcb,
+           [#include <$lyx_qt5_config>
+           QT_QPA_DEFAULT_PLATFORM_NAME],
+           [AC_MSG_RESULT(yes)
+            AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],
+           [AC_MSG_RESULT(no)])
+       else
+         AC_PREPROC_IFELSE([AC_LANG_SOURCE([
+           [#include <qglobal.h>],
+           [#ifndef Q_WS_X11],
+           [#error Fail],
+           [#endif]])],
+           qt_use_x11=yes,
+           qt_use_x11=no)
+         AC_MSG_RESULT($qt_use_x11)
+         if test "x$qt_use_x11" = "xyes"; then
+           QT_LIB="$QT_LIB -lX11"
+         fi
+       fi
+       CPPFLAGS=$save_CPPFLAGS
+
        QT_FIND_TOOL([QT_MOC], [moc])
        QT_FIND_TOOL([QT_UIC], [uic])
        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
@@ -197,15 +226,23 @@ AC_DEFUN([QT_DO_PKG_CONFIG],
          export PKG_CONFIG_PATH
        fi
        qt_corelibs="QtCore"
-       qt_guilibs="QtCore QtGui"
+       qt_guilibs="QtCore QtGui QtSvg"
        if test "x$USE_QT5" != "xno" ; then
                qt_corelibs="Qt5Core"
-               qt_guilibs="Qt5Core Qt5Concurrent Qt5Gui Qt5Widgets"
+               qt_guilibs="Qt5Core Qt5Concurrent Qt5Gui Qt5Svg Qt5Widgets"
+               lyx_use_x11extras=false
+               PKG_CHECK_EXISTS(Qt5X11Extras, [lyx_use_x11extras=true], [])
+               if $lyx_use_x11extras; then
+                       qt_guilibs="$qt_guilibs Qt5X11Extras xcb"
+                       AC_DEFINE(HAVE_QT5_X11_EXTRAS, 1,
+                               [Define if you have the Qt5X11Extras module])
+               fi
                lyx_use_winextras=false
                PKG_CHECK_EXISTS(Qt5WinExtras, [lyx_use_winextras=true], [])
                if $lyx_use_winextras; then
                        qt_guilibs="$qt_guilibs Qt5WinExtras"
                fi
+               lyx_use_macextras=false
                PKG_CHECK_EXISTS(Qt5MacExtras, [lyx_use_macextras=true], [])
                if $lyx_use_macextras; then
                        qt_guilibs="$qt_guilibs Qt5MacExtras"
@@ -247,8 +284,13 @@ AC_DEFUN([QT_DO_PKG_CONFIG],
 AC_DEFUN([QT_DO_MANUAL_CONFIG],
 [
        dnl Check for X libraries
-       AC_PATH_X
-       AC_PATH_XTRA
+       case ${host} in
+       *mingw*) ;;
+       *) \
+         AC_PATH_X \
+         AC_PATH_XTRA \
+       ;;
+       esac
        case $have_x in
            yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
                 CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
@@ -263,7 +305,7 @@ AC_DEFUN([QT_DO_MANUAL_CONFIG],
        QT_CORE_LDFLAGS=
        if test -n "$qt_cv_includes"; then
                QT_INCLUDES="-I$qt_cv_includes"
-               for i in Qt QtCore QtGui QtWidgets QtConcurrent QtMacExtras; do
+               for i in Qt QtCore QtGui QtWidgets QtSvg QtConcurrent QtMacExtras; do
                        QT_INCLUDES="$QT_INCLUDES -I$qt_cv_includes/$i"
                done
                QT_CORE_INCLUDES="-I$qt_cv_includes -I$qt_cv_includes/QtCore"