diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-12-19 19:04:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-12-19 19:04:57 +0000 |
| commit | 1208041a4a5a476cccd8a7ac4492899cc5893e12 (patch) | |
| tree | 23b9095cec2f62effe04be9133d11f970d0fc341 /ui/qt/QtShark.pro | |
| parent | 456acec8924d6b947a040fcd2124dfcdbd67f639 (diff) | |
| download | wireshark-1208041a4a5a476cccd8a7ac4492899cc5893e12.tar.gz wireshark-1208041a4a5a476cccd8a7ac4492899cc5893e12.tar.bz2 wireshark-1208041a4a5a476cccd8a7ac4492899cc5893e12.zip | |
Try using the system-supplied zlib on OS X.
svn path=/trunk/; revision=46618
Diffstat (limited to 'ui/qt/QtShark.pro')
| -rw-r--r-- | ui/qt/QtShark.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index f153aeb3fa..31323766af 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -71,8 +71,10 @@ unix { } # Some versions of Ubuntu don't ship with zlib.pc - eval(PKGCONFIG += zlib) { - PKGCONFIG += zlib + !macx { + eval(PKGCONFIG += zlib) { + PKGCONFIG += zlib + } } } @@ -241,7 +243,7 @@ macx:QMAKE_LFLAGS += \ unix:LIBS += -L../../lib -Wl,-rpath ../../lib -lwireshark -lwiretap -lwsutil -lui \ -lpcap -lui_dirty -macx:LIBS += -Wl,-macosx_version_min,10.5 -liconv +macx:LIBS += -Wl,-macosx_version_min,10.5 -liconv -lz # XXX Copy this only if we're linking with Lua. EXTRA_BINFILES = \ |