Remove a deep copy of MathData in lyx::write

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 1346146ce7a73511d219f21d32b06eca191a3a7e..33029b933d0010ffa6d4e1c3f924a4fa3ca8e2b3 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)
@@ -169,6 +169,19 @@ AC_DEFUN([QT_DO_IT_ALL],
        [AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QTLIB_VERSION has been found.])
        ])
 
+       if test x$USE_QT5 = xyes ; then
+         save_CPPFLAGS=$CPPFLAGS
+         AC_MSG_CHECKING([whether Qt uses the X Window system])
+         CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES"
+         AC_EGREP_CPP(xcb,
+           [#include <qconfig.h>
+           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)])
+         CPPFLAGS=$save_CPPFLAGS
+       fi
+
        QT_FIND_TOOL([QT_MOC], [moc])
        QT_FIND_TOOL([QT_UIC], [uic])
        QT_FIND_TOOL([QT_RCC], [rcc])
@@ -189,10 +202,10 @@ 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_winextras=false
                PKG_CHECK_EXISTS(Qt5WinExtras, [lyx_use_winextras=true], [])
                if $lyx_use_winextras; then
@@ -256,7 +269,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"