Update fr.po

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index d89f30ada59de49614c9d21b79f24813cda8b39a..ac8daa255f9131e3a5fc400724892ac507f47313 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -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,6 +207,14 @@ 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,