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:00:50 +0000 |
| commit | 5bda98586b4f81c14a5f3b8feacd10392dc0d078 (patch) | |
| tree | c233edffc0a55a8154fee676f61978e2550d0b2a /macosx-setup.sh | |
| parent | 57b17187d5eda5dd481d1bf5c5e026866fc38e91 (diff) | |
| download | wireshark-5bda98586b4f81c14a5f3b8feacd10392dc0d078.tar.gz | |
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>
Diffstat (limited to 'macosx-setup.sh')
| -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 2c6345a9f7..b01a273500 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -2699,7 +2699,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 if $no_build; then echo "All required dependencies downloaded. Run without -n to install them." |