diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-24 22:14:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-24 22:14:50 +0000 |
| commit | 9c5b6c76a621478d6f3715a8a7e4d34f7ee9e4f2 (patch) | |
| tree | ec5af4825c3c86cd5071795291a3ce3998468b83 /aclocal-fallback | |
| parent | 8fa093daa58cecab28dcf1c9afc70f6d21e9fd38 (diff) | |
| download | wireshark-9c5b6c76a621478d6f3715a8a7e4d34f7ee9e4f2.tar.gz wireshark-9c5b6c76a621478d6f3715a8a7e4d34f7ee9e4f2.tar.bz2 wireshark-9c5b6c76a621478d6f3715a8a7e4d34f7ee9e4f2.zip | |
Check for QtMacExtras, and use it if we have it.
svn path=/trunk/; revision=50880
Diffstat (limited to 'aclocal-fallback')
| -rw-r--r-- | aclocal-fallback/qt.m4 | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/aclocal-fallback/qt.m4 b/aclocal-fallback/qt.m4 index c10deeb3ce..1299229e4f 100644 --- a/aclocal-fallback/qt.m4 +++ b/aclocal-fallback/qt.m4 @@ -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 |