gimp r27371 - in branches/gimp-2-6: . app/config

[neo svn gnome org]

Author: neo
Date: Wed Oct 22 22:05:18 2008
New Revision: 27371
URL: http://svn.gnome.org/viewvc/gimp?rev=27371&view=rev

Log:
2008-10-23  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* configure.in: removed check for Carbon and added a test for 
the
	target OS being Darwin instead.

	* app/config/gimpguiconfig.c: use PLATFORM_OSX instead of
	HAVE_CARBON to determine the default "web-browser" command.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/config/gimpguiconfig.c
   branches/gimp-2-6/configure.in

Modified: branches/gimp-2-6/app/config/gimpguiconfig.c
==============================================================================
--- branches/gimp-2-6/app/config/gimpguiconfig.c	(original)
+++ branches/gimp-2-6/app/config/gimpguiconfig.c	Wed Oct 22 22:05:18 2008
@@ -42,7 +42,7 @@
 
 #ifdef G_OS_WIN32
 #  define DEFAULT_WEB_BROWSER  "not used on Windows"
-#elif HAVE_CARBON
+#elif PLATFORM_OSX
 #  define DEFAULT_WEB_BROWSER  "open %s"
 #else
 #  define DEFAULT_WEB_BROWSER  "firefox %s"

Modified: branches/gimp-2-6/configure.in
==============================================================================
--- branches/gimp-2-6/configure.in	(original)
+++ branches/gimp-2-6/configure.in	Wed Oct 22 22:05:18 2008
@@ -1706,9 +1706,25 @@
 AC_SUBST(SCREENSHOT)
 
 
-############################################################
-# Check for Mac OS X TWAIN framework (can't build on Darwin)
-############################################################
+####################
+# Check for Mac OS X
+####################
+
+AC_MSG_CHECKING([checking if compiling for Mac OS X])
+case "$target_or_host" in
+  *-*-darwin*)
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(PLATFORM_OSX, 1, [define to 1 if compiling for Mac OS X])
+     ;;
+  *)
+     AC_MSG_RESULT(no)
+     ;;
+esac
+
+
+####################################
+# Check for Mac OS X TWAIN framework
+####################################
 
 mac_twain_ok=no
 AC_MSG_CHECKING([checking for Mac OS X TWAIN support])
@@ -1720,25 +1736,6 @@
 AM_CONDITIONAL(HAVE_MAC_TWAIN, test "x$mac_twain_ok" = xyes)
 
 
-#############################################################
-# Check for Mac OS X Carbon framework (can't build on Darwin)
-#############################################################
-
-carbon_ok=no
-AC_MSG_CHECKING([checking for Mac OS X Carbon support])
-AC_TRY_CPP([
-#include <Carbon/Carbon.h>
-#include <CoreServices/CoreServices.h>
-], carbon_ok=yes)
-AC_MSG_RESULT($carbon_ok)
-if test "x$carbon_ok" = "xyes"; then
-  AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
-  CARBON_LDFLAGS="-framework Carbon"
-  AC_SUBST(CARBON_LDFLAGS)
-fi
-AM_CONDITIONAL(HAVE_CARBON, test "x$carbon_ok" = "xyes")
-
-
 ##########################################################
 # Determine where to install the desktop & mime info files
 ##########################################################