diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2012-08-13 11:54:37 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2012-08-13 11:54:37 +0000 |
| commit | 2fdacf0d0d21f54a8e84386fb71f688d25a03e36 (patch) | |
| tree | bdd3fd56effd89c116e5670321cfb1df691b4380 /macosx-setup.sh | |
| parent | 53f8694977346b25a4dfd1c4826caef3c397a45a (diff) | |
Build cairo on Leopard too.
svn path=/trunk/; revision=44468
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index 75480bff0f..f0c11a5fa0 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -8,6 +8,8 @@ # http://nplab.fh-muenster.de/groups/wiki/wiki/fb7a4/Building_Wireshark_on_SnowLeopard.html # +MACOSX_VERSION=`uname -r | sed 's/\([0-9]*\).*/\1/'` + # To set up a GTK3 environment # GTK3=1 # To build cmake @@ -199,9 +201,9 @@ cd .. # the GUI (Wireshark). # -if [ -n "$GTK3" ]; then +if [[ -n "$GTK3" || $MACOSX_VERSION = "9" ]]; then # - # Cairo is part of Mac OS X 10.6 (and, I think, 10.5). + # 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. |