r18996 - gnucash/trunk - Make sure only the quartz build uses environment-osx.in

[Geert Janssens]

Author: gjanssens
Date: 2010-04-05 14:08:26 -0400 (Mon, 05 Apr 2010)
New Revision: 18996
Trac: http://svn.gnucash.org/trac/changeset/18996

Modified:
   gnucash/trunk/configure.in
   gnucash/trunk/src/bin/Makefile.am
Log:
Make sure only the quartz build uses environment-osx.in

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2010-04-05 16:48:09 UTC (rev 18995)
+++ gnucash/trunk/configure.in	2010-04-05 18:08:26 UTC (rev 18996)
@@ -239,6 +239,7 @@
 		platform=osx
 		_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
 		if test "x$_gdk_tgt" = xquartz; then 
+		   platform=darwin/quartz
 		   AC_MSG_RESULT(yes)
 		   AC_DEFINE(GDK_QUARTZ,,[Using GDK Quartz (not X11)])
 		   AC_MSG_CHECKING(For ige-mac-integration)   
@@ -247,10 +248,10 @@
 				     AC_MSG_RESULT(no))
 		   AC_SUBST(IGE_MAC_LIBS)
 		   AC_SUBST(IGE_MAC_CFLAGS)
+		   GNUCASH_ENVIRONMENT="environment-osx"
 		else
 		   AC_MSG_RESULT(no)
 		fi
-		GNUCASH_ENVIRONMENT="environment-osx"
 		;;
 	mingw*|cygwin*)
 		platform=win32
@@ -301,6 +302,7 @@
 
 AM_CONDITIONAL(PLATFORM_LINUX, test "x$platform" = "xlinux/other")
 AM_CONDITIONAL(PLATFORM_OSX, test "x$platform" = "xdarwin")
+AM_CONDITIONAL(PLATFORM_OSX_QUARTZ, test "x$platform" = "xdarwin/quartz")
 AM_CONDITIONAL(PLATFORM_WIN32, test "x$platform" = "xwin32")
 AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")
 

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
+++ gnucash/trunk/src/bin/Makefile.am	2010-04-05 18:08:26 UTC (rev 18996)
@@ -37,7 +37,7 @@
 configdir = ${GNC_CONFIGDIR}
 config_DATA = environment
 
-if PLATFORM_OSX
+if PLATFORM_OSX_QUARTZ
 PRE_RUN = if test -z \"\$$DBUS_SESSION_BUS_ADDRESS\"; then\n\
     eval \`dbus-launch --sh-syntax --exit-with-session --config-file=${PREFIX}/etc/dbus-1/session.conf\`\nfi\n
 else