IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make sure only the quartz build uses environment-osx.in

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18996 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2010-04-05 18:08:26 +00:00
parent 54324efc7f
commit a8f22f38e3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -239,6 +239,7 @@ update to latest darwin])
platform=osx platform=osx
_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0` _gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
if test "x$_gdk_tgt" = xquartz; then if test "x$_gdk_tgt" = xquartz; then
platform=darwin/quartz
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(GDK_QUARTZ,,[Using GDK Quartz (not X11)]) AC_DEFINE(GDK_QUARTZ,,[Using GDK Quartz (not X11)])
AC_MSG_CHECKING(For ige-mac-integration) AC_MSG_CHECKING(For ige-mac-integration)
@ -247,10 +248,10 @@ update to latest darwin])
AC_MSG_RESULT(no)) AC_MSG_RESULT(no))
AC_SUBST(IGE_MAC_LIBS) AC_SUBST(IGE_MAC_LIBS)
AC_SUBST(IGE_MAC_CFLAGS) AC_SUBST(IGE_MAC_CFLAGS)
GNUCASH_ENVIRONMENT="environment-osx"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
GNUCASH_ENVIRONMENT="environment-osx"
;; ;;
mingw*|cygwin*) mingw*|cygwin*)
platform=win32 platform=win32
@ -301,6 +302,7 @@ AC_SUBST(GNUCASH_ENVIRONMENT)
AM_CONDITIONAL(PLATFORM_LINUX, test "x$platform" = "xlinux/other") AM_CONDITIONAL(PLATFORM_LINUX, test "x$platform" = "xlinux/other")
AM_CONDITIONAL(PLATFORM_OSX, test "x$platform" = "xdarwin") 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(PLATFORM_WIN32, test "x$platform" = "xwin32")
AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes") AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")

2
src/bin/Makefile.am
View File

@ -37,7 +37,7 @@ GNUCASH_BIN_INSTALL_NAME=`echo gnucash-bin | sed -e '$(transform)'`
configdir = ${GNC_CONFIGDIR} configdir = ${GNC_CONFIGDIR}
config_DATA = environment config_DATA = environment
if PLATFORM_OSX if PLATFORM_OSX_QUARTZ
PRE_RUN = if test -z \"\$$DBUS_SESSION_BUS_ADDRESS\"; then\n\ 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 eval \`dbus-launch --sh-syntax --exit-with-session --config-file=${PREFIX}/etc/dbus-1/session.conf\`\nfi\n
else else