diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-09-21 20:48:37 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-09-22 03:49:22 +0000 |
commit | c568b9df0430489c9a1b1011a5f4b69ac28fd9f0 (patch) | |
tree | ad40a02f9bdf9f713e65636c1d3e2ded9c78c3c6 /macosx-setup.sh | |
parent | 6b495a13ccd40d42dcca4b0a8ca9e37784adaa1b (diff) | |
download | wireshark-c568b9df0430489c9a1b1011a5f4b69ac28fd9f0.tar.gz wireshark-c568b9df0430489c9a1b1011a5f4b69ac28fd9f0.tar.bz2 wireshark-c568b9df0430489c9a1b1011a5f4b69ac28fd9f0.zip |
Don't mention a particular version of XQuartz.
The version we were using is out of date and, because we don't download
it in the script, we don't *need* the version, we can just point people
to http://www.xquartz.org.
Change-Id: I049e55c11a6877a1ad888288a157cc8527740b16
Reviewed-on: https://code.wireshark.org/review/17850
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit bf95ccca2eb903b81f3ddd0de7e21c42d687a64c)
Reviewed-on: https://code.wireshark.org/review/17851
Diffstat (limited to 'macosx-setup.sh')
-rwxr-xr-x | macosx-setup.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index 599b93bfcf..c296117cc4 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -106,11 +106,6 @@ if [ "$QT_VERSION" ]; then QT_MAJOR_MINOR_DOTDOT_VERSION=$QT_MAJOR_VERSION.$QT_MINOR_VERSION.$QT_DOTDOT_VERSION fi -# In case we want to build GTK *and* we don't have Apple's X11 SDK installed -# we may want to install XQuartz. The version will only be used in the printing -# of a URL, the package will not be installed. -# -XQUARTZ_VERSION=2.7.5 # # The following libraries are optional. # Comment them out if you don't want them, but note that some of @@ -2369,9 +2364,9 @@ if [ "$GTK_VERSION" ]; then # if [ ! -d /usr/X11/include ]; then echo "Please install X11 and the X11 SDK first." - echo " You can either use http://xquartz.macosforge.org/, e.g." - echo " http://xquartz-dl.macosforge.org/SL/XQuartz-$XQUARTZ_VERSION.dmg" - echo " or the native Apple packages if you are on Lion or below." + echo " You can either download the latest package from" + echo " http://www.xquartz.org/ and install it or install" + echo " the native Apple package if you are on Lion or below." exit 1 fi fi |