[LyX/master] Give error if a required Qt6 module is missing
Enrico Forestieri
forenr at lyx.org
Sat Jul 15 12:15:15 UTC 2023
commit 99f972e2c4494c308546091d0f5e6ba107214415
Author: Enrico Forestieri <forenr at lyx.org>
Date: Sat Jul 15 15:25:33 2023 +0200
Give error if a required Qt6 module is missing
Configure would not stop in such cases and a subsequent make would fail.
---
config/qt.m4 | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/config/qt.m4 b/config/qt.m4
index aa90d56..e738723 100644
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -414,12 +414,13 @@ EOF1
AC_SUBST(QT_CORE_LDFLAGS)
AC_SUBST(QT_CORE_LIB)
cat > $lyx_test_qt_pro << EOF2
-qtHaveModule(core): QT += core
-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 gui-private} else {MISSING += gui}
+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
@@ -439,6 +440,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)
More information about the lyx-cvs
mailing list