qt detection

9 years ago · 548d3fdb0b
parent bd448558c7
commit 548d3fdb0b
3 changed files with 6 additions and 2 deletions
--- a/configure.ac
+++ b/configure.ac
@ -22,6 +22,10 @@ AC_CONFIG_FILES(makefile src/makefile debian/changelog debian/control)
 AC_PROG_CXX
 AC_PROG_CC

+AC_CHECK_PROG(QMAKE, qmake-qt5)
+AC_CHECK_PROG(QMAKE, qtchooser, [qtchooser -run-tool=qmake -qt=qt5])
+AC_CHECK_PROG(QMAKE, qmake)
+
 README=$(tail -n +3 README)
 README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g')
 DESCRIPTION=$(head -1 README)
--- a/debian/control.in
+++ b/debian/control.in
@ -2,7 +2,7 @@ Source: @PACKAGE_NAME@
 Section: devel
 Priority: extra
 Maintainer: @AUTHOR@
-Build-Depends: debhelper (>= 8.0.0), libtool, svn2cl, autotools-dev, lsb-release, mrw-c++-dev, libxml-cxx-dev, qt5-qmake
+Build-Depends: debhelper (>= 8.0.0), pkg-config, libtool, svn2cl, autotools-dev, doxygen, graphviz, lsb-release, mrw-c++-dev, libxml-cxx-dev, qt5-qmake, libqt5webkit5-dev, qtchooser | qt5-default
 Standards-Version: 3.9.2
 Homepage: https://dev.marc.waeckerlin.org/redmine/@PACKAGE_NAME@

--- a/src/makefile.am
+++ b/src/makefile.am
@ -15,7 +15,7 @@ webrunner: make.webrunner
 webtester: make.webtester

 makefile.%: ${srcdir}/webtester.pro
-	qmake -makefile -o $@ -config debug -config ${@:makefile.%=%} $<
+	${QMAKE} -makefile -o $@ -config debug -config ${@:makefile.%=%} $<

 make.%: makefile.%
 	make -f ${<}