osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Check for QtMacExtras, and use it if we have it. 

svn path=/trunk/; revision=50880
This commit is contained in:
Guy Harris 2013-07-24 22:14:50 +00:00
parent 8fa093daa5
commit 9c5b6c76a6
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
aclocal-fallback/qt.m4
View File

@ -90,6 +90,28 @@ AC_DEFUN([AM_PATH_QT],
AC_MSG_NOTICE([QtPrintSupport not found. Assuming Qt4])
fi
#
# While we're at it, look for QtMacExtras. (Presumably
# if we're not building for OS X, it won't be present.)
#
# XXX - is there anything in QtX11Extras or QtWinExtras
# that we should be using?
#
AC_MSG_CHECKING(for QtMacExtras)
if QtMacExtras_CFLAGS=`$PKG_CONFIG --cflags Qt5MacExtras 2>/dev/null`; then
Qt_CFLAGS="$Qt_CFLAGS $QtMacExtras_CFLAGS"
Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs Qt5MacExtras 2>/dev/null`"
AC_DEFINE(QT_MACEXTRAS_LIB, 1, [Define if we have QtMacExtras])
AC_MSG_RESULT(yes)
elif QtMacExtras_CFLAGS=`$PKG_CONFIG --cflags QtMacExtras 2>/dev/null`; then
Qt_CFLAGS="$Qt_CFLAGS $QtMacExtras_CFLAGS -DQT_MACEXTRAS_LIB"
Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs QtMacExtras 2>/dev/null`"
AC_DEFINE(QT_MACEXTRAS_LIB, 1, [Define if we have QtMacExtras])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
AC_SUBST(Qt_LIBS)
# Run Action-If-Found