aboutsummaryrefslogtreecommitdiffstats
path: root/macosx-setup.sh
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2014-03-17 00:07:10 +0100
committerJörg Mayer <jmayer@loplof.de>2014-03-16 23:09:41 +0000
commit46970c440757ba0f1447a8d4a3da2ddfa4593df8 (patch)
treefde7137739019808be2762d6ea17bdf4dfda24dc /macosx-setup.sh
parent17fc3b48ee95720cf78093a454a443d898e46217 (diff)
Print a message in case we don't have an X11 SDK installed about where
to find xquartz. Change-Id: I76548fba0b01f8274d12bbb55f4f16622d9a7eff Reviewed-on: https://code.wireshark.org/review/704 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'macosx-setup.sh')
-rwxr-xr-xmacosx-setup.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh
index f543639654..8d2985f105 100755
--- a/macosx-setup.sh
+++ b/macosx-setup.sh
@@ -92,6 +92,11 @@ if [ "$GTK_VERSION" ]; then
GDK_PIXBUF_VERSION=2.28.0
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
@@ -700,6 +705,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."
exit 1
fi
fi