Author: matt
Date: 2009-09-19 00:37:24 -0700 (Sat, 19 Sep 2009)
New Revision: 6882
Log:
Fixed the OS X Snow Leopard patch which would fail for versions greate 10.6 
(10.6.1, for example)

Modified:
   branches/branch-1.1/configure.in

Modified: branches/branch-1.1/configure.in
===================================================================
--- branches/branch-1.1/configure.in    2009-09-18 11:21:53 UTC (rev 6881)
+++ branches/branch-1.1/configure.in    2009-09-19 07:37:24 UTC (rev 6882)
@@ -87,7 +87,10 @@
         # 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"

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to