[gnumeric] Compilation: downgrade libgsf requirement.

[Morten Welinder <mortenw src gnome org>]

commit 0795f9f243b9fce611469e3d96eaa03e1fce645a
Author: Morten Welinder <terra gnome org>
Date:   Mon Sep 20 19:52:25 2010 -0400

    Compilation: downgrade libgsf requirement.

 ChangeLog                            |    3 +++
 README                               |    2 +-
 configure.in                         |    9 ++++++++-
 plugins/openoffice/ChangeLog         |   10 +++++++---
 plugins/openoffice/openoffice-read.c |    3 ++-
 5 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c1bd1ba..a914e7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-20  Morten Welinder  <terra gnome org>
 
+	* configure.in (libspreadsheet_reqs): Downgrade libgsf
+	requirement.  Check for OO_NS_CHART_OOO.
+
 	* src/sheet.c (sheet_range_set_text): Get a format for matching
 	from upper left corner of range.  Mostly fixes #630177.
 
diff --git a/README b/README
index 3626f05..4a971e4 100644
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ Requirements
 You need:				Debian package name
 	glib		>= 2.12.0	libglib2.0-dev
 	gtk+		>= 2.12.0	libgtk2.0-dev
-	libgsf		>= 1.14.15	libgsf-1-dev
+	libgsf		>= 1.14.18	libgsf-1-dev
 	libgoffice	>= 0.8.10	libgoffice-0-8-dev
 	libglade	>= 2.3.6	libglade2-dev
 	gnome-xml   	>= 2.4.12	libxml2-dev
diff --git a/configure.in b/configure.in
index fdf213b..cab46fb 100644
--- a/configure.in
+++ b/configure.in
@@ -147,7 +147,7 @@ PKG_PROG_PKG_CONFIG(0.18)
 dnl *****************************
 libspreadsheet_reqs="
 	libgoffice-${GOFFICE_API_VER}	>= 0.8.10
-	libgsf-1		>= 1.14.19
+	libgsf-1		>= 1.14.18
 	libxml-2.0		>= 2.4.12
 "
 gnumeric_reqs="$libspreadsheet_reqs
@@ -701,6 +701,13 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pango/pango.h>]],
 		AC_MSG_RESULT(yes)],
 	       [AC_MSG_RESULT(no)])
 
+AC_MSG_CHECKING([for OO_NS_CHART_OOO])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gsf/gsf-opendoc-utils.h>]],
+				[[(void)((int)OO_NS_CHART_OOO == 42);]])],
+               [AC_DEFINE(HAVE_OO_NS_CHART_OOO, 1, [Define if OO_NS_CHART_OOO is available])
+		AC_MSG_RESULT(yes)],
+	       [AC_MSG_RESULT(no)])
+
 CFLAGS=$SAVE_CFLAGS
 LIBS=$SAVE_LIBS
 
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 717476d..ca5b93d 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,11 +1,15 @@
+2010-09-20  Morten Welinder  <terra gnome org>
+
+	* openoffice-read.c: Use OO_NS_CHART_OOO only conditionally.
+
 2010-09-20  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-	* openoffice-read.c (oo_style_prop_cell): read strike-through 
+	* openoffice-read.c (oo_style_prop_cell): read strike-through
 	  info
 
 2010-09-18  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-	* openoffice-read.c (odf_created_by_gnumeric): avoid null 
+	* openoffice-read.c (odf_created_by_gnumeric): avoid null
 	  pointer on incomplete ODF file.
 
 2010-09-18  Andreas J. Guelzow <aguelzow pyrshep ca>
@@ -15,7 +19,7 @@
 
 2010-09-15  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-	* openoffice-read.c (od_style_prop_chart): add 
+	* openoffice-read.c (od_style_prop_chart): add
 	   OO_NS_STYLE "rotation-angle"
 	* openoffice-write.c (odf_write_axis_categories): new
 	(odf_write_axis): call odf_write_axis_categories
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 1699648..25c04ea 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -7366,8 +7366,9 @@ static GsfXMLInNode const opendoc_content_dtd [] =
 		  GSF_XML_IN_NODE (CHART_AXIS, CHART_GRID, OO_NS_CHART, "grid", GSF_XML_NO_CONTENT, &oo_chart_grid, NULL),
 		  GSF_XML_IN_NODE (CHART_AXIS, CHART_AXIS_CAT,   OO_NS_CHART, "categories", GSF_XML_NO_CONTENT, &od_chart_axis_categories, NULL),
 		  GSF_XML_IN_NODE (CHART_AXIS, CHART_TITLE, OO_NS_CHART, "title", GSF_XML_NO_CONTENT, NULL, NULL),				/* 2nd Def */
+#ifdef HAVE_OO_NS_CHART_OOO
 	        GSF_XML_IN_NODE (CHART_PLOT_AREA, CHART_OOO_COORDINATE_REGION, OO_NS_CHART_OOO, "coordinate-region", GSF_XML_NO_CONTENT, NULL, NULL),
-
+#endif
 	    GSF_XML_IN_NODE (SPREADSHEET, TABLE, OO_NS_TABLE, "table", GSF_XML_NO_CONTENT, &oo_table_start, &oo_table_end),
 	      GSF_XML_IN_NODE (TABLE, FORMS, OO_NS_OFFICE, "forms", GSF_XML_NO_CONTENT, NULL, NULL),
 	        GSF_XML_IN_NODE (FORMS, FORM, OO_NS_FORM, "form", GSF_XML_NO_CONTENT, NULL, NULL),