diff options
author | Guy Harris <guy@alum.mit.edu> | 2012-08-13 16:38:25 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2012-08-13 16:38:25 +0000 |
commit | 0843cfd1088f9389cff53c48f6dc861c664774f7 (patch) | |
tree | 6e1d9f20ff03c0ee3ed536232809a8573e2e23ef /macosx-setup.sh | |
parent | 5c7e01c4cb46f5485ce998af6e15941e10914b67 (diff) |
Expand the "why we need to build Cairo in some cases" comment, and put
it before the checks for whether to build Cairo.
svn path=/trunk/; revision=44471
Diffstat (limited to 'macosx-setup.sh')
-rwxr-xr-x | macosx-setup.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index f0c11a5fa0..8a2f03bd38 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -200,15 +200,17 @@ cd .. # Now we have reached a point where we can build everything but # the GUI (Wireshark). # - +# Cairo is part of Mac OS X 10.6 and 10.7. +# The *headers* are supplied by 10.5, but the *libraries* aren't, so +# we have to build it on 10.5. +# GTK+ 3 requires a newer Cairo build than the one that comes with +# 10.6, so we build Cairo if we are using GTK+ 3. +# In 10.6 and 10.7, it's an X11 library; if we build with "native" GTK+ +# rather than X11 GTK+, we might have to build and install Cairo. +# if [[ -n "$GTK3" || $MACOSX_VERSION = "9" ]]; then # - # Cairo is part of Mac OS X 10.6, but broken in 10.5. - # However, it's an X11 library; if we build with "native" GTK+ rather - # than X11 GTK+, we might have to build and install Cairo. - # GTK+-3 requires a newer cairo build as well. - # - # Requirements for cairo first + # Requirements for Cairo first # echo "Downloading, building, and installing libpng:" curl -O ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-$PNG_VERSION.tar.xz @@ -229,7 +231,7 @@ if [[ -n "$GTK3" || $MACOSX_VERSION = "9" ]]; then cd .. # - # And now cairo itself. + # And now Cairo itself. # echo "Downloading, building, and installing Cairo:" curl -O http://cairographics.org/releases/cairo-$CAIRO_VERSION.tar.xz || exit 1 |