diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-28 20:00:14 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-29 03:02:34 +0000 |
| commit | 72452799d5a118005b961a836b499236f5c0d9f1 (patch) | |
| tree | cada57fdd3edc723373c03b7d1a04e6071d384c0 | |
| parent | 6e652aac92207386e360ac78f001810a2cd59842 (diff) | |
| download | wireshark-72452799d5a118005b961a836b499236f5c0d9f1.tar.gz wireshark-72452799d5a118005b961a836b499236f5c0d9f1.tar.bz2 wireshark-72452799d5a118005b961a836b499236f5c0d9f1.zip | |
Don't add /usr/X11/lib/pkgconfig if we're not using GTK+.
Qt for macOS doesn't use X11, so you don't need X11.
Change-Id: Ibc09a2d802f21b5be38baf735d2f6d582d6bf41f
Reviewed-on: https://code.wireshark.org/review/21401
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 5bda98586b4f81c14a5f3b8feacd10392dc0d078)
Reviewed-on: https://code.wireshark.org/review/21402
| -rwxr-xr-x | macosx-setup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index ed51aa3015..b40ff84f03 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -2381,7 +2381,9 @@ if [ "$QT_VERSION" ]; then pkg_config_path="$pkg_config_path":"$qt_base_path/lib/pkgconfig" CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH":"$qt_base_path/lib/cmake" fi -pkg_config_path="$pkg_config_path":/usr/X11/lib/pkgconfig +if [ "$GTK_VERSION" ]; then + pkg_config_path="$pkg_config_path":/usr/X11/lib/pkgconfig +fi echo "You are now prepared to build Wireshark." echo |