[grisbi-cvs] [SCM] grisbi branch, pbiava_integration_mac_osx, updated. upstream_version_0_7_3-15-g09db18a

[Pierre Biava]

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, pbiava_integration_mac_osx has been updated
       via  09db18a820b5d7ff3f1dd242d44da27526fc9493 (commit)
       via  d58d233d7cceed2866f2f6f614bc8832c5d0153e (commit)
       via  fbe78dcd96cb2f0993495c2c1147ffddd6034af0 (commit)
      from  72d95c75dba671a6d754de93fbd02b1f640658e7 (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 09db18a820b5d7ff3f1dd242d44da27526fc9493
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Sep 4 19:29:06 2010 +0200

    adaptation of configure.in file

commit d58d233d7cceed2866f2f6f614bc8832c5d0153e
Merge: fbe78dcd96cb2f0993495c2c1147ffddd6034af0 72d95c75dba671a6d754de93fbd02b1f640658e7
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Sep 4 15:55:30 2010 +0200

    Merge remote branch 'remotes/origin/pbiava_integration_mac_osx' into pbiava_integration_mac_osx

commit fbe78dcd96cb2f0993495c2c1147ffddd6034af0
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Sep 4 06:52:02 2010 +0200

    fixes a bug in change of year in the budgetary module

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

Changes:
diff --git a/configure.in b/configure.in
index d583abf..ab249d1 100644
--- a/configure.in
+++ b/configure.in
@@ -245,6 +245,10 @@ dnl ================================================================
 
 AC_MSG_CHECKING([for Mac OS X platform])
 case "$host" in
+  rhapsody* | darwin[1567].*)
+    AC_MSG_RESULT([darwin, but too old])
+    AC_MSG_ERROR([This platform is not supported, please update to latest  darwin])
+    ;;
   *-*-darwin*)
     platform_osx=yes
     ;;
@@ -255,30 +259,28 @@ esac
 AC_MSG_RESULT([$platform_osx])
 AM_CONDITIONAL(PLATFORM_OSX, test "$platform_osx" = "yes")
 
-dnl check for native osx
-gdk_windowing=`$PKG_CONFIG --variable=target gdk-2.0`
-
-AC_MSG_CHECKING([for native Mac OS X])
-if test "$gdk_windowing" = "quartz"; then
-	os_osx=yes
-	ACTIVE_PLUGINS="${ACTIVE_PLUGINS},checkupdate"
+if test "x$platform_osx" = xyes; then
+  dnl check for native osx
+  gdk_windowing=`$PKG_CONFIG --variable=target gdk-2.0`
+  AC_MSG_CHECKING([for GDK-Quartz])
+
+  if test "x$gdk_windowing" = xquartz; then
+        platform=darwin/quartz
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(GDK_QUARTZ,,[Using GDK Quartz (not X11)])
+        PKG_CHECK_MODULES(IGE_MAC, ige-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])
+        fi
+        AC_SUBST(IGE_MAC_CFLAGS)
+        AC_SUBST(IGE_MAC_LIBS)    
+  else
+	AC_MSG_RESULT(no)
+    os_osx=no
+  fi
 else
-	os_osx=no
-fi
-AC_MSG_RESULT([$os_osx])
-AM_CONDITIONAL(OS_OSX, test "$os_osx" = "yes")
-
-if test "$platform_osx" = "yes"; then
-	AC_DEFINE([PLATFORM_OSX],[1],[Defined if platform is Mac OSX])
-fi
-
-if test "$os_osx" = "yes"; then
-	AC_DEFINE([OS_OSX],[1],[Defined if os is Mac OSX])
-
-	PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
-
-	AC_SUBST(IGE_MAC_CFLAGS)
-	AC_SUBST(IGE_MAC_LIBS)
+    os_osx=no
 fi
 
 dnl ================================================================
@@ -314,10 +316,11 @@ AC_OUTPUT
 
 echo "
 
-                Build plugin support:  $build_plugins
-                Build with libxml2:    $build_libxml2
-                Build with OpenSSL:    $build_openssl
-                Build with OFX plugin: $build_ofx
+                Build plugin support:      $build_plugins
+                Build with libxml2:        $build_libxml2
+                Build with OpenSSL:        $build_openssl
+                Build with OFX plugin:     $build_ofx
+                Build ige_mac_integration: $os_osx
 
 "
 if expr ${GRISBI_MINOR_VERSION} % 2 > /dev/null; then
diff --git a/src/grisbi_osx.c b/src/grisbi_osx.c
index 05bffab..6eb3d75 100644
--- a/src/grisbi_osx.c
+++ b/src/grisbi_osx.c
@@ -23,7 +23,7 @@
 
 /* WARNING this is a copy of test_integration.c (from ige-mac-integration-0.9.5) */
 
-#ifdef OS_OSX
+#ifdef GTKOSXAPPLICATION
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -536,7 +536,7 @@ void grisbi_osx_print_element ( void )
 {
     return;
 }
-#endif /* OS_OSX */
+#endif /* GTKOSXAPPLICATION */
 
 /**
  *
diff --git a/src/include.h b/src/include.h
index a74c720..b64ae36 100644
--- a/src/include.h
+++ b/src/include.h
@@ -26,9 +26,9 @@
 #include <ctype.h>
 #include <errno.h>
 #include <math.h>
-#ifdef OS_OSX
+#ifdef GTKOSXAPPLICATION
 #include <gtkosxapplication.h>
-#endif /* OS_OSX */
+#endif /* GTKOSXAPPLICATION */
 
 #define G_BROKEN_FILENAMES 1
 #include <gtk/gtktextview.h>
diff --git a/src/main.c b/src/main.c
index 2097ef1..661e386 100644
--- a/src/main.c
+++ b/src/main.c
@@ -52,9 +52,9 @@
 #include "erreur.h"
 /*END_INCLUDE*/
 
-#ifdef OS_OSX
+#ifdef GTKOSXAPPLICATION
 #include "grisbi_osx.h"
-#endif  /* OS_OSX */
+#endif  /* GTKOSXAPPLICATION */
 
 /* including resources so that the exe generated with MSVC has the right icon. */
 #ifdef _MSC_VER
@@ -133,7 +133,7 @@ int main ( int argc, char **argv )
 
 #ifdef _WIN32
     main_win_32 (  argc, argv );
-#elif defined OS_OSX
+#elif defined GTKOSXAPPLICATION
         main_mac_osx ( argc, argv );
 #else
         main_linux ( argc, argv );
@@ -200,7 +200,7 @@ void main_linux ( int argc, char **argv )
  * */
 void main_mac_osx ( int argc, char **argv )
 {
-#ifdef OS_OSX
+#ifdef GTKOSXAPPLICATION
 /*     gboolean first_use = FALSE;  */
 /*     cmdline_options  opt;  */
     GtkWidget *window1, *window2;
@@ -264,7 +264,7 @@ void main_mac_osx ( int argc, char **argv )
 
     return 0;
 
-#endif /* OS_OSX */
+#endif /* GTKOSXAPPLICATION */
 }
 
 


hooks/post-receive
-- 
grisbi