fixed qt build; refs #28

master
Marc Wäckerlin 11 years ago
parent f0fde0507e
commit 9596d5d760
  1. 18
      configure.in

@ -95,17 +95,19 @@ PKG_PROG_PKG_CONFIG
# libraries # libraries
PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui], 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])], [PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])],
[AC_DEFINE([HAVE_QTGUI], [1], [Use QtGui])], [have_qtgui=1],
[AC_DEFINE([HAVE_QTGUI], [0], [Do not use QtGui])]) [have_qtgui=0])
AC_DEFINE([HAVE_QTGUI], "$have_qtgui")
AM_CONDITIONAL(HAVE_QTGUI, test "$have_qtgui" = "1")
PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork], PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork],
[AC_DEFINE([HAVE_QTNETWORK], [1], [Use QtNetwork])], [have_qtnetwork=1],
[PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])], [PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])],
[AC_DEFINE([HAVE_QTNETWORK], [1], [Use QtNetwork])], [have_qtnetwork=1],
[AC_DEFINE([HAVE_QTNETWORK], [0], [Do not use QtNetwork])]) [have_qtnetwork=0])
AM_CONDITIONAL(HAVE_QTGUI, test "$HAVE_QTGUI" = "1") AC_DEFINE([HAVE_QTNETWORK], "$have_qtnetwork")
AM_CONDITIONAL(HAVE_QTNETWORK, test "$HAVE_QTNETWORK" = "1") AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1")
AC_ARG_ENABLE(pedantic, AC_ARG_ENABLE(pedantic,
[AS_HELP_STRING([--enable-pedantic], [AS_HELP_STRING([--enable-pedantic],

Loading…
Cancel
Save