summaryrefslogtreecommitdiff
path: root/m4/ax_have_qt.m4
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2019-04-26 15:04:16 +0200
committerRalf Habacker <ralf.habacker@freenet.de>2019-04-26 20:18:39 +0200
commitd148ca3fe1af3321b36b94f60d1ee5efb94705bc (patch)
tree5d71bef61ec5d35021ffba4f7da6836d686ac075 /m4/ax_have_qt.m4
parent474c8f1a4389b7b9dd1ca9b040f7ff0cd7c80132 (diff)
downloadautoconf-archive-d148ca3fe1af3321b36b94f60d1ee5efb94705bc.tar.gz
ax_have_qt.m4: Fix not getting variables from the generated Makefile on Windows
Under Windows, the generated Makefile does not contain the required information by default, because it is contained in other Makefiles for the Release and Debug build variants. It is therefore necessary to use only one build variant.
Diffstat (limited to 'm4/ax_have_qt.m4')
-rw-r--r--m4/ax_have_qt.m46
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/ax_have_qt.m4 b/m4/ax_have_qt.m4
index c71a760..ca9e499 100644
--- a/m4/ax_have_qt.m4
+++ b/m4/ax_have_qt.m4
@@ -54,7 +54,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 15
+#serial 16
AU_ALIAS([BNV_HAVE_QT], [AX_HAVE_QT])
AC_DEFUN([AX_HAVE_QT],
@@ -73,6 +73,10 @@ AC_DEFUN([AX_HAVE_QT],
am_have_qt_makefile=`mktemp`
# http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt
cat > $am_have_qt_pro << EOF
+win32 {
+ CONFIG -= debug_and_release
+ CONFIG += release
+}
qtHaveModule(axcontainer): QT += axcontainer
qtHaveModule(axserver): QT += axserver
qtHaveModule(concurrent): QT += concurrent