libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

better Qt detection; refs #33

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-09-16 08:24:57 +00:00
parent 6559f229b2
commit 7820475076
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.in
View File

@@ -115,27 +115,35 @@ dnl AC_CHECK_HEADER([wintypes.h], [], [AC_MSG_ERROR([Header wintypes.h is requir
PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets], PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets],
[AC_DEFINE([HAVE_QTGUI]) [AC_DEFINE([HAVE_QTGUI])
UIC=${UIC:-$(pkg-config --variable=uic_location Qt5Core)} UIC=${UIC:-$(pkg-config --variable=uic_location Qt5Core)}
UIC=${UIC:-$(pkg-config --variable=host_bins Qt5Core)/uic}
MOC=${MOC:-$(pkg-config --variable=moc_location Qt5Core)} MOC=${MOC:-$(pkg-config --variable=moc_location Qt5Core)}
MOC=${MOC:-$(pkg-config --variable=host_bins Qt5Core)/moc}
have_qtgui=1], have_qtgui=1],
[PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui], [PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui],
[AC_DEFINE([HAVE_QTGUI]) [AC_DEFINE([HAVE_QTGUI])
UIC=${UIC:-$(pkg-config --variable=uic_location QtCore)} UIC=${UIC:-$(pkg-config --variable=uic_location QtCore)}
UIC=${UIC:-$(pkg-config --variable=host_bins QtCore)/uic}
MOC=${MOC:-$(pkg-config --variable=moc_location QtCore)} MOC=${MOC:-$(pkg-config --variable=moc_location QtCore)}
MOC=${MOC:-$(pkg-config --variable=host_bins QtCore)/moc}
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], [Qt5Network], PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network],
[UIC=${UIC:-$(pkg-config --variable=uic_location Qt5Core)} [UIC=${UIC:-$(pkg-config --variable=uic_location Qt5Core)}
UIC=${UIC:-$(pkg-config --variable=host_bins Qt5Core)/uic}
MOC=${MOC:-$(pkg-config --variable=moc_location Qt5Core)} MOC=${MOC:-$(pkg-config --variable=moc_location Qt5Core)}
MOC=${MOC:-$(pkg-config --variable=host_bins Qt5Core)/moc}
have_qtnetwork=1], have_qtnetwork=1],
[PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork], [PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork],
[AC_DEFINE([HAVE_QTNETWORK]) [AC_DEFINE([HAVE_QTNETWORK])
UIC=${UIC:-$(pkg-config --variable=uic_location QtCore)} UIC=${UIC:-$(pkg-config --variable=uic_location QtCore)}
UIC=${UIC:-$(pkg-config --variable=host_bins QtCore)/uic}
MOC=${MOC:-$(pkg-config --variable=moc_location QtCore)} MOC=${MOC:-$(pkg-config --variable=moc_location QtCore)}
MOC=${MOC:-$(pkg-config --variable=host_bins QtCore)/moc}
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")
if test "$have_qt" = "1" \ if test $have_qtgui -eq 1 -o $have_qtnetwork -eq 1 \
&& ! which "$UIC" "$MOC"; then && ! which "$UIC" "$MOC"; then
if test -n "$MOC" && which "${UIC:=${MOC/moc/uic}}"; then if test -n "$MOC" && which "${UIC:=${MOC/moc/uic}}"; then
AC_MSG_NOTICE([Detected: "$UIC" "$MOC"]) AC_MSG_NOTICE([Detected: "$UIC" "$MOC"])