From 9596d5d76041d9cae42dd60cd1619cbaf5678532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 31 Mar 2014 13:26:53 +0000 Subject: [PATCH] fixed qt build; refs #28 --- configure.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index 06c5bf7..16ecb41 100644 --- a/configure.in +++ b/configure.in @@ -95,17 +95,19 @@ PKG_PROG_PKG_CONFIG # libraries PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui], - [AC_DEFINE([HAVE_QTGUI], [1], [Use QtGui])], + [have_qtgui=1], [PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])], - [AC_DEFINE([HAVE_QTGUI], [1], [Use QtGui])], - [AC_DEFINE([HAVE_QTGUI], [0], [Do not use QtGui])]) + [have_qtgui=1], + [have_qtgui=0]) +AC_DEFINE([HAVE_QTGUI], "$have_qtgui") +AM_CONDITIONAL(HAVE_QTGUI, test "$have_qtgui" = "1") PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork], - [AC_DEFINE([HAVE_QTNETWORK], [1], [Use QtNetwork])], + [have_qtnetwork=1], [PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])], - [AC_DEFINE([HAVE_QTNETWORK], [1], [Use QtNetwork])], - [AC_DEFINE([HAVE_QTNETWORK], [0], [Do not use QtNetwork])]) -AM_CONDITIONAL(HAVE_QTGUI, test "$HAVE_QTGUI" = "1") -AM_CONDITIONAL(HAVE_QTNETWORK, test "$HAVE_QTNETWORK" = "1") + [have_qtnetwork=1], + [have_qtnetwork=0]) +AC_DEFINE([HAVE_QTNETWORK], "$have_qtnetwork") +AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1") AC_ARG_ENABLE(pedantic, [AS_HELP_STRING([--enable-pedantic],