g-brief loads babel internally. So don't load it ourselves.

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index d89f30ada59de49614c9d21b79f24813cda8b39a..7e7ffd6df2af62275fd72a873f351b5fd31b27a1 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -27,8 +27,8 @@ AC_DEFUN([QT_CHECK_COMPILE],
                qt_corelibs="-lQtCore -lQtCore4"
                qt_guilibs="'-lQtCore -lQtGui' '-lQtCore4 -lQtGui4'"
                if test $USE_QT6 = "yes" ; then
-                   qt_corelibs="-lQt6Core -lQt6Core5Compat"
-                   qt_guilibs="-lQt6Core -lQt6Core5Compat -lQt6Concurrent -lQt6Gui -lQt6Svg -lQt6Widgets"
+                   qt_corelibs="-lQt6Core"
+                   qt_guilibs="-lQt6Core -lQt6Concurrent -lQt6Gui -lQt6Svg -lQt6Widgets"
                else
                    qt_corelibs="-lQt5Core"
                    qt_guilibs="-lQt5Core -lQt5Concurrent -lQt5Gui -lQt5Svg -lQt5Widgets"
@@ -44,7 +44,7 @@ AC_DEFUN([QT_CHECK_COMPILE],
                qt_cv_libname=
                for libname in $qt_guilibs \
                               '-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtWidgets -framework QtMacExtras -framework QtGui'\
-                              '-framework QtCore -framework QtConcurrent -framework QtCore5Compat -framework QtSvg -framework QtSvgWidgets -framework QtWidgets -framework QtGui'\
+                              '-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtSvgWidgets -framework QtWidgets -framework QtGui'\
                               '-framework QtCore -framework QtGui'
                do
                        QT_TRY_LINK($libname)
@@ -128,7 +128,7 @@ dnl start here
 AC_DEFUN([QT_DO_IT_ALL],
 [
        dnl this variable is precious
-       AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt4])
+       AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt5])
 
        AC_ARG_WITH(qt-dir, [AS_HELP_STRING([--with-qt-dir], [where the root of Qt is installed])],
                [ qt_cv_dir=`eval echo "$withval"/` ])
@@ -184,7 +184,7 @@ AC_DEFUN([QT_DO_IT_ALL],
        fi
 
        if test -z "$QT_LIB"; then
-         dnl Try again with Qt5 and then Qt4 if configuring for Qt6/5 fails
+         dnl Try again with Qt5 and if configuring for Qt6/5 fails
          if test x$USE_QT6 = xyes ; then
                USE_QT6=no
                AC_SUBST([USE_QT6])
@@ -207,19 +207,24 @@ AC_DEFUN([QT_DO_IT_ALL],
        [AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QTLIB_VERSION has been found.])
        ])
 
+       case $QTLIB_VERSION in
+       6.*) if test $enable_stdlib_debug = "yes" ; then
+                   LYX_WARNING([Compiling LyX with stdlib-debug and Qt6 library may lead to
+   crashes. Consider dropping --enable-stdlib-debug.])
+            fi;;
+       esac
+
+
        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_CHECK_HEADER(QtGui/private/qtgui-config_p.h,
-         [lyx_qt6_config=QtGui/private/qtgui-config_p.h],
-         [lyx_qt6_config=qconfig.h])
+         [lyx_qt_config=QtGui/qtgui-config.h],
+         [lyx_qt_config=qconfig.h])
        AC_MSG_CHECKING([whether Qt uses the X Window system])
        if test x$USE_QT6 = xyes ; then
          dnl FIXME: Check whether defining QPA_XCB makes sense with Qt6
          AC_PREPROC_IFELSE([AC_LANG_SOURCE([
-           [#include <$lyx_qt6_config>]
+           [#include <$lyx_qt_config>]
            [#if !defined(QT_FEATURE_xcb) || QT_FEATURE_xcb < 0]
            [#error Fail]
            [#endif]])],
@@ -228,7 +233,7 @@ AC_DEFUN([QT_DO_IT_ALL],
            [AC_MSG_RESULT(no)])
        else
          AC_EGREP_CPP(xcb,
-           [#include <$lyx_qt5_config>
+           [#include <$lyx_qt_config>
            QT_QPA_DEFAULT_PLATFORM_NAME],
            [AC_MSG_RESULT(yes)
             AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],
@@ -331,7 +336,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 QtSvg QtConcurrent QtSvgWidgets QtCore5Compat QtMacExtras; do
+               for i in Qt QtCore QtGui QtWidgets QtSvg QtConcurrent QtSvgWidgets QtMacExtras; do
                        QT_INCLUDES="$QT_INCLUDES -I$qt_cv_includes/$i"
                        if test "$lyx_use_packaging" = "macosx" ; then
                                QT_INCLUDES="$QT_INCLUDES -I$qt_cv_libraries/${i}.framework/Headers"
@@ -384,7 +389,6 @@ AC_DEFUN([QT6_QMAKE_CONFIG],
            lyx_test_qt_mak="$lyx_test_qt_dir/Makefile"
            cat > $lyx_test_qt_pro << EOF1
 qtHaveModule(core):            QT += core
-qtHaveModule(core5compat):     QT += core5compat
 percent.target = %
 percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
@@ -407,13 +411,14 @@ EOF1
                AC_SUBST(QT_CORE_LDFLAGS)
                AC_SUBST(QT_CORE_LIB)
                cat > $lyx_test_qt_pro << EOF2
-qtHaveModule(core):            QT += core
-qtHaveModule(core5compat):     QT += core5compat
-qtHaveModule(concurrent):      QT += concurrent
-qtHaveModule(gui):             QT += gui gui-private
-qtHaveModule(svg):             QT += svg
-qtHaveModule(svgwidgets):      QT += svgwidgets
-qtHaveModule(widgets):         QT += widgets
+QMAKE_EXTRA_VARIABLES = MISSING
+qtHaveModule(core)             {QT += core} else {MISSING += core}
+qtHaveModule(concurrent)       {QT += concurrent} else {MISSING += concurrent}
+qtHaveModule(gui)              {QT += gui} else {MISSING += gui}
+qtHaveModule(gui-private)      {QT += gui-private} else {MISSING += gui-private}
+qtHaveModule(svg)              {QT += svg} else {MISSING += svg}
+qtHaveModule(svgwidgets)       {QT += svgwidgets} else {MISSING += svgwidgets}
+qtHaveModule(widgets)          {QT += widgets} else {MISSING += widgets}
 percent.target = %
 percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
@@ -433,6 +438,10 @@ EOF2
                if test -z "$QT_LIB"; then
                    AC_MSG_RESULT(no)
                else
+                   QT_MISSING=`cd $lyx_test_qt_dir; make -s -f $lyx_test_qt_mak EXPORT_MISSING | sed 's/^ *//'`
+                   if test -n "$QT_MISSING"; then
+                           AC_MSG_ERROR([Qt6 module(s) $QT_MISSING not found.])
+                   fi
                    AC_MSG_RESULT(yes)
                    AC_SUBST(QT_INCLUDES)
                    AC_SUBST(QT_LDFLAGS)