[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_4-83-g9b725a9

[NIEL Gérald]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  9b725a9e4b9b8f8b65c6291e6766a0f1716727e5 (commit)
      from  00ddaedb00101e20b0eeb0686e24d7ecd6ab730e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9b725a9e4b9b8f8b65c6291e6766a0f1716727e5
Author: Gérald Niel <gerald at mbp15-gn.local>
Date:   Sat Oct 8 08:51:05 2011 +0200

    Fixes for version of gtk-mac-integration-1.

-----------------------------------------------------------------------

Changes:
diff --git a/configure.in b/configure.in
index 8ab64eb..511acda 100644
--- a/configure.in
+++ b/configure.in
@@ -294,10 +294,12 @@ if test "x$platform_osx" = xyes; then
         platform=darwin/quartz
         AC_MSG_RESULT(yes)
         AC_DEFINE(GDK_QUARTZ,[1],[Using GDK Quartz (not X11)])
-        PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration, [os_osx=yes], [os_osx=no])
+        PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration, [os_osx=yes], [os_osx=no])
         AC_MSG_RESULT(${os_osx})
         if test "x$os_osx" = xyes; then
 	      AC_DEFINE([GTKOSXAPPLICATION],[1],[Defined if app is GtkOSXApplication])
+	      AC_SUBST(GTK_MAC_LIBS)
+	      AC_SUBST(GTK_MAC_CFLAGS)
         fi
   else
 	AC_MSG_RESULT(no)
@@ -362,7 +364,7 @@ echo "
                 Build with OFX plugin:     $build_ofx
                 Build with goffice:         $build_goffice
                 Build plugins statically:  $enable_static
-                Build ige_mac_integration: $os_osx
+                Build gtk_mac_integration: $os_osx
                 CUnit/unit tests support:  $build_cunit
 
 "
diff --git a/src/Makefile.am b/src/Makefile.am
index ebde1e9..b58bdfb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 # Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GRISBI_CFLAGS) $(IGE_MAC_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\"" -DUI_DIR="\"$(datadir)/@PACKAGE@/ui\""
+AM_CPPFLAGS = -I$(top_srcdir) $(GRISBI_CFLAGS) $(GTK_MAC_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\"" -DUI_DIR="\"$(datadir)/@PACKAGE@/ui\""
 
 if HAVE_GOFFICE
 AM_CPPFLAGS += $(GOFFICE_CFLAGS)
@@ -9,7 +9,7 @@ endif
 bin_PROGRAMS = grisbi
 noinst_LTLIBRARIES = libgrisbi.la
 
-grisbi_LDADD = $(GRISBI_LIBS) $(IGE_MAC_LIBS) libgrisbi.la
+grisbi_LDADD = $(GRISBI_LIBS) $(GTK_MAC_LIBS) libgrisbi.la
 
 libgrisbi_la_LIBADD =
 if ENABLE_STATIC
@@ -20,7 +20,7 @@ libgrisbi_la_LIBADD += \
 else
 libgrisbi_la_LDFLAGS = -export_dynamic
 endif
-libgrisbi_la_LIBADD += $(GRISBI_LIBS) $(IGE_MAC_LIBS)
+libgrisbi_la_LIBADD += $(GRISBI_LIBS) $(GTK_MAC_LIBS)
 
 if HAVE_GOFFICE
 libgrisbi_la_LIBADD += $(GOFFICE_LIBS)


hooks/post-receive
-- 
grisbi