libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

first check Qt5 and allow to pass UIC/MOC explicitely; refs #30

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-04-28 11:47:02 +00:00
parent a0ece73632
commit 611fe01597
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure.in
View File

@@ -94,27 +94,27 @@ AC_CHECK_PROG(have_dot, dot, yes, no)
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
# libraries # libraries
PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui], PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets],
[AC_DEFINE([HAVE_QTGUI]) [AC_DEFINE([HAVE_QTGUI])
UIC=$(pkg-config --variable=uic_location QtCore) UIC=${UIC:-$(pkg-config --variable=uic_location Qt5Core)}
MOC=$(pkg-config --variable=moc_location QtCore) MOC=${MOC:-$(pkg-config --variable=moc_location Qt5Core)}
have_qtgui=1], have_qtgui=1],
[PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])], [PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui])],
[AC_DEFINE([HAVE_QTGUI]) [AC_DEFINE([HAVE_QTGUI])
UIC=$(pkg-config --variable=uic_location Qt5Core) UIC=${UIC:-$(pkg-config --variable=uic_location QtCore)}
MOC=$(pkg-config --variable=moc_location Qt5Core) MOC=${MOC:-$(pkg-config --variable=moc_location QtCore)}
have_qtgui=1], have_qtgui=1],
[have_qtgui=0]) [have_qtgui=0])
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], [Qt5Network],
[AC_DEFINE([HAVE_QTNETWORK]) [AC_DEFINE([HAVE_QTNETWORK])
UIC=$(pkg-config --variable=uic_location QtCore) UIC=${UIC:-$(pkg-config --variable=uic_location Qt5Core)}
MOC=$(pkg-config --variable=moc_location QtCore) MOC=${MOC:-$(pkg-config --variable=moc_location Qt5Core)}
have_qtnetwork=1], have_qtnetwork=1],
[PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])], [PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork])],
[AC_DEFINE([HAVE_QTNETWORK]) [AC_DEFINE([HAVE_QTNETWORK])
UIC=$(pkg-config --variable=uic_location Qt5Core) UIC=${UIC:-$(pkg-config --variable=uic_location QtCore)}
MOC=$(pkg-config --variable=moc_location Qt5Core) MOC=${MOC:-$(pkg-config --variable=moc_location QtCore)}
have_qtnetwork=1], have_qtnetwork=1],
[have_qtnetwork=0]) [have_qtnetwork=0])
AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1") AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1")