osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2017-04-28 20:00:14 -07:00
parent 57b17187d5
commit 5bda98586b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macosx-setup.sh
View File

@ -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."