[Gnucash-changes] LibGOffice conditional build fixes

Neil Williams codehelp at cvs.gnucash.org
Thu Oct 13 08:30:40 EDT 2005


Log Message:
-----------
LibGOffice conditional build fixes

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        configure.in
    gnucash/lib:
        Makefile.am
    gnucash/src/gnome-utils:
        gnc-html-graph-gog.c
        gnc-plugin.c

Revision Data
-------------
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.359.2.68
retrieving revision 1.359.2.69
diff -Lconfigure.in -Lconfigure.in -u -r1.359.2.68 -r1.359.2.69
--- configure.in
+++ configure.in
@@ -409,14 +409,14 @@
 GOFFICE_REQUIRED=0.0.3
 GSF_REQUIRED=1.12.0
 AC_MSG_CHECKING([for GOffice and GSF])
-LIBGOFFICE_CFLAGS=`$PKG_CONFIG --silence-errors --cflags " libgoffice >= GOFFICE_REQUIRED"`
-LIBGOFFICE_LIBS=`$PKG_CONFIG --silence-errors --libs " libgoffice >= GOFFICE_REQUIRED"`
-LIBGSF_CFLAGS=`$PKG_CONFIG --silence-errors --cflags " libgsf >= GSF_REQUIRED"`
-LIBGSF_LIBS=`$PKG_CONFIG --silence-errors --libs " libgoffice >= GSF_REQUIRED"`
+LIBGOFFICE_CFLAGS=`$PKG_CONFIG --silence-errors --cflags " libgoffice-1 >= $GOFFICE_REQUIRED"`
+LIBGOFFICE_LIBS=`$PKG_CONFIG --silence-errors --libs " libgoffice-1 >= $GOFFICE_REQUIRED"`
+LIBGSF_CFLAGS=`$PKG_CONFIG --silence-errors --cflags " libgsf-1 >= $GSF_REQUIRED"`
+LIBGSF_LIBS=`$PKG_CONFIG --silence-errors --libs " libgsf-1 >= $GSF_REQUIRED"`
 AC_SUBST(LIBGOFFICE_CFLAGS)
 AC_SUBST(LIBGOFFICE_LIBS)
 
-if test "x$LIBGOFFICE_LIBS" = x; then
+if test x"$LIBGOFFICE_LIBS" = x; then
   AC_MSG_RESULT([No, GOffice not found, will build using internal goffice library.])
 else
   AC_MSG_RESULT([Yes, using GOffice])
@@ -1371,9 +1371,21 @@
 if test x$RPC_DIR = xrpc ; then
        AC_MSG_WARN([
 
-       The RPC Backend is depricated.  You should not use it.
+       The RPC Backend is deprecated.  You should not use it.
        It may go away in the future.  If you need it, please
        contact gnucash-devel at gnucash.org and let the developers
        know.
        ])
 fi
+
+AC_MSG_RESULT([
+  Options detected/selected
+  -------------------------
+  gnucash version ...... : $VERSION
+  Build for host ....... : $host
+  Extra Warnings ....... : $warnFLAGS
+  CPPFLAGS ............. : $CPPFLAGS
+  CFLAGS ............... : $CFLAGS
+  LDFLAGS .............. : $LDFLAGS
+])
+
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/Makefile.am,v
retrieving revision 1.6.4.5
retrieving revision 1.6.4.6
diff -Llib/Makefile.am -Llib/Makefile.am -u -r1.6.4.5 -r1.6.4.6
--- lib/Makefile.am
+++ lib/Makefile.am
@@ -1,4 +1,7 @@
-
+if USE_LIBGOFFICE
+SUBDIRS = libc glib26 guile-www srfi
+else
 SUBDIRS = libc glib26 guile-www srfi goffice
+endif
 
 EXTRA_DIST = README guppi-legend.patch
Index: gnc-html-graph-gog.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-html-graph-gog.c,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -Lsrc/gnome-utils/gnc-html-graph-gog.c -Lsrc/gnome-utils/gnc-html-graph-gog.c -u -r1.1.4.6 -r1.1.4.7
--- src/gnome-utils/gnc-html-graph-gog.c
+++ src/gnome-utils/gnc-html-graph-gog.c
@@ -32,7 +32,20 @@
 #include "gnc-html.h"
 #include "gnc-trace.h"
 #include "gnc-engine.h"
-
+#ifdef HAVE_GOFFICE
+#include <goffice/goffice.h>
+#include <goffice/graph/gog-graph.h>
+#include <goffice/graph/gog-object.h>
+#include <goffice/graph/gog-renderer-pixbuf.h>
+#include <goffice/graph/gog-style.h>
+#include <goffice/graph/gog-styled-object.h>
+#include <goffice/graph/gog-plot.h>
+#include <goffice/graph/gog-series.h>
+#include <goffice/utils/go-color.h>
+#include <goffice/graph/gog-data-set.h>
+#include <goffice/graph/gog-renderer-svg.h>
+#include <goffice/data/go-data-simple.h>
+#else
 #include "goffice.h"
 #include "graph/gog-graph.h"
 #include "graph/gog-object.h"
@@ -46,7 +59,7 @@
 #include "graph/gog-data-set.h"
 #include "graph/gog-styled-object.h"
 #include "graph/gog-style.h"
-
+#endif
 #include <gsf/gsf.h>
 #include <gsf/gsf-output-memory.h>
 
@@ -229,7 +242,9 @@
   }
 
   tmp = gog_object_add_by_name(chart, "Title", NULL);
+#ifndef HAVE_GOFFICE
   gog_object_set_pos(tmp, GOG_POSITION_N | GOG_POSITION_ALIGN_START);
+#endif
   titleScalar = go_data_scalar_str_new(totalTitle->str, FALSE);
   gog_dataset_set_dim(GOG_DATASET(tmp), 0, titleScalar, NULL);
 
@@ -330,11 +345,19 @@
   GOG_STYLED_OBJECT(graph)->style->outline.color = RGBA_BLACK;
 
   series = gog_plot_new_series(plot);
+#ifdef HAVE_GOFFICE
+  labelData = go_data_vector_str_new((char const * const *)labels, datasize, NULL);
+#else
   labelData = go_data_vector_str_new((char const * const *)labels, datasize);
+#endif
   gog_series_set_dim(series, 0, labelData, NULL);
   go_data_emit_changed(GO_DATA(labelData));
 
+#ifdef HAVE_GOFFICE
+  sliceData = go_data_vector_val_new(data, datasize, NULL);
+#else
   sliceData = go_data_vector_val_new(data, datasize);
+#endif
   gog_series_set_dim(series, 1, sliceData, NULL);
   go_data_emit_changed(GO_DATA(sliceData));
 
@@ -426,8 +449,11 @@
                 "type",                         barType,
                 "overlap_percentage",           barOverlap, 
 		NULL);
-
-  labelData = go_data_vector_str_new(  (char const * const *)row_labels, datarows );
+#ifdef HAVE_GOFFICE
+  labelData = go_data_vector_str_new(  (char const * const *)col_labels, datacols, NULL );
+#else
+  labelData = go_data_vector_str_new(  (char const * const *)col_labels, datacols );
+#endif
   {
     // foreach row:
     //   series = row
@@ -448,7 +474,11 @@
       gog_series_set_dim( series, 0, labelData, NULL );
       go_data_emit_changed (GO_DATA (labelData));
 
+#ifdef HAVE_GOFFICE
+      sliceData = go_data_vector_val_new( data + (i*datarows), datarows, NULL );
+#else
       sliceData = go_data_vector_val_new( data + (i*datarows), datarows );
+#endif
       gog_series_set_dim( series, 1, sliceData, NULL );
       
       /*
@@ -509,11 +539,19 @@
 
   series = gog_plot_new_series( plot );
 
+#ifdef HAVE_GOFFICE
+  sliceData = go_data_vector_val_new( xData, datasize, NULL );
+#else
   sliceData = go_data_vector_val_new( xData, datasize );
+#endif
   gog_series_set_dim( series, 0, sliceData, NULL );
   go_data_emit_changed (GO_DATA (sliceData));
 
+#ifdef HAVE_GOFFICE
+  sliceData = go_data_vector_val_new( yData, datasize, NULL );
+#else
   sliceData = go_data_vector_val_new( yData, datasize );
+#endif
   gog_series_set_dim( series, 1, sliceData, NULL );
   go_data_emit_changed (GO_DATA (sliceData));
 
Index: gnc-plugin.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-plugin.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/gnome-utils/gnc-plugin.c -Lsrc/gnome-utils/gnc-plugin.c -u -r1.1.2.6 -r1.1.2.7
--- src/gnome-utils/gnc-plugin.c
+++ src/gnome-utils/gnc-plugin.c
@@ -313,7 +313,11 @@
 
   for (i = 0; name[i]; i++) {
     action = gtk_action_group_get_action (action_group, name[i]);
+#ifdef HAVE_GOFFICE
+    g_object_set (G_OBJECT(action), "is_important", TRUE, FALSE, NULL);
+#else
     g_object_set (G_OBJECT(action), "is_important", TRUE, FALSE);
+#endif
   }
 
   /* If this trips, you've got too many "important" actions.  That


More information about the gnucash-changes mailing list