From bf95ccca2eb903b81f3ddd0de7e21c42d687a64c Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 21 Sep 2016 20:48:37 -0700 Subject: 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 --- macosx-setup.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'macosx-setup.sh') 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 -- cgit v1.2.1