Changeset 28326

Timestamp:

2013-09-27T18:57:49+12:00 (11 years ago)

Author:

ak19

Message:

Mac 11/12 (Lion/Mountain Lion) need CUPS. Mac 9/10 (Leopard, Snow Leopard) don't need it and gnome-lib fails to compile with it.

File:

• gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh (modified) (1 diff)

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh

@@ -10 +10 @@
 # glib getting a conflict during its configure stage over the version of iconv
 
-if [ "x$GSDLOS" = "xdarwin" ] ; then
+# Mac 11/12 (Lion/Mountain Lion) need CUPS. Mac 9/10 (Leopard, Snow Leopard) don't need it and gnome-lib fails to compile with it.
+osversion=`uname -r | sed 's/\..*$//'`;
+if [ "x$GSDLOS" = "xdarwin" -a $osversion -ge 11 ] ; then
     pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL CUPS LIBICONV GETTEXT PKG-CONFIG LIBXML LIBFFI GLIB LIBGSF"    
 fi