summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2009-09-19 07:37:38 +0000
committerMatthias Melcher <fltk@matthiasm.com>2009-09-19 07:37:38 +0000
commitd5b5659dbceedb5de05591f501a09855d5474486 (patch)
tree7b4680c866f46b2eee3d6d94b3510f996d979245
parentaf556fc53b1e617fdc6d37f439ee82c2391fd03c (diff)
Fixed the OS X Snow Leopard patch which would fail for versions greate 10.6 (10.6.1, for example)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6883 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--configure.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 12299fc46..3b78f8932 100644
--- a/configure.in
+++ b/configure.in
@@ -97,7 +97,10 @@ case $uname in
# Starting with 10.6 (Snow Leopard), OS X does not support
# Carbon calls anymore. We patch this until we are completely Cocoa compliant
# by limiting ourselves to 32 bit Intel compiles
- if test `sw_vers -productVersion` = "10.6"; then
+ d_ver_rev=`sw_vers -productVersion | sed -e 's/\.[[0-9]][[0-9]]*//2'`
+ d_ver=`echo $d_ver_rev | sed -e 's/\.[[0-9]][[0-9]]*//'`
+ d_rev=`echo $d_ver_rev | sed -e 's/[[0-9]][[0-9]]*\.//'`
+ if test $d_ver -gt 10 -o $d_ver -eq 10 -a $d_rev -ge 6; then
CFLAGS="$CFLAGS -arch i386"
CXXFLAGS="$CXXFLAGS -arch i386"
LDFLAGS="$LDFLAGS -arch i386"