mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Give error if a required Qt6 module is missing
Configure would not stop in such cases and a subsequent make would fail.
This commit is contained in:
parent
582eb7cc03
commit
99f972e2c4
17
config/qt.m4
17
config/qt.m4
@ -414,12 +414,13 @@ EOF1
|
|||||||
AC_SUBST(QT_CORE_LDFLAGS)
|
AC_SUBST(QT_CORE_LDFLAGS)
|
||||||
AC_SUBST(QT_CORE_LIB)
|
AC_SUBST(QT_CORE_LIB)
|
||||||
cat > $lyx_test_qt_pro << EOF2
|
cat > $lyx_test_qt_pro << EOF2
|
||||||
qtHaveModule(core): QT += core
|
QMAKE_EXTRA_VARIABLES = MISSING
|
||||||
qtHaveModule(concurrent): QT += concurrent
|
qtHaveModule(core) {QT += core} else {MISSING += core}
|
||||||
qtHaveModule(gui): QT += gui gui-private
|
qtHaveModule(concurrent) {QT += concurrent} else {MISSING += concurrent}
|
||||||
qtHaveModule(svg): QT += svg
|
qtHaveModule(gui) {QT += gui gui-private} else {MISSING += gui}
|
||||||
qtHaveModule(svgwidgets): QT += svgwidgets
|
qtHaveModule(svg) {QT += svg} else {MISSING += svg}
|
||||||
qtHaveModule(widgets): QT += widgets
|
qtHaveModule(svgwidgets) {QT += svgwidgets} else {MISSING += svgwidgets}
|
||||||
|
qtHaveModule(widgets) {QT += widgets} else {MISSING += widgets}
|
||||||
percent.target = %
|
percent.target = %
|
||||||
percent.commands = @echo -n "\$(\$(@))\ "
|
percent.commands = @echo -n "\$(\$(@))\ "
|
||||||
QMAKE_EXTRA_TARGETS += percent
|
QMAKE_EXTRA_TARGETS += percent
|
||||||
@ -439,6 +440,10 @@ EOF2
|
|||||||
if test -z "$QT_LIB"; then
|
if test -z "$QT_LIB"; then
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
else
|
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_MSG_RESULT(yes)
|
||||||
AC_SUBST(QT_INCLUDES)
|
AC_SUBST(QT_INCLUDES)
|
||||||
AC_SUBST(QT_LDFLAGS)
|
AC_SUBST(QT_LDFLAGS)
|
||||||
|
Loading…
Reference in New Issue
Block a user