fix for non C++11-compilers (mac); refs #28
This commit is contained in:
14
configure.in
14
configure.in
@@ -95,18 +95,20 @@ PKG_PROG_PKG_CONFIG
|
|||||||
|
|
||||||
# libraries
|
# libraries
|
||||||
PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui],
|
PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui],
|
||||||
[have_qtgui=1],
|
[AC_DEFINE([HAVE_QTGUI])
|
||||||
|
have_qtgui=1],
|
||||||
[PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])],
|
[PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])],
|
||||||
[have_qtgui=1],
|
[AC_DEFINE([HAVE_QTGUI])
|
||||||
|
have_qtgui=1],
|
||||||
[have_qtgui=0])
|
[have_qtgui=0])
|
||||||
AC_DEFINE([HAVE_QTGUI], "$have_qtgui")
|
|
||||||
AM_CONDITIONAL(HAVE_QTGUI, test "$have_qtgui" = "1")
|
AM_CONDITIONAL(HAVE_QTGUI, test "$have_qtgui" = "1")
|
||||||
PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork],
|
PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork],
|
||||||
[have_qtnetwork=1],
|
[AC_DEFINE([HAVE_QTNETWORK], $have_qtnetwork)
|
||||||
|
have_qtnetwork=1],
|
||||||
[PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])],
|
[PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])],
|
||||||
[have_qtnetwork=1],
|
[AC_DEFINE([HAVE_QTNETWORK], $have_qtnetwork)
|
||||||
|
have_qtnetwork=1],
|
||||||
[have_qtnetwork=0])
|
[have_qtnetwork=0])
|
||||||
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,
|
||||||
|
Reference in New Issue
Block a user