From 27cc40906c7b388fc0bec644b324ef6a4dec6dc3 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 31 Jul 2009 07:18:06 +0200
Subject: [PATCH] Initial attempt at an ODF driver

---
 config/devices         | 2 ++
 configure.ac           | 2 +-
 src/output/automake.mk | 3 +++
 src/output/output.c    | 1 +
 src/output/output.h    | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/devices b/config/devices
index d42500cf..2c080e76 100644
--- a/config/devices
+++ b/config/devices
@@ -85,6 +85,8 @@ pdf:cairo:listing:
 svg:cairo:listing:output-type=svg output-file="pspp.svg"
 ps-cairo:cairo:listing:output-type=ps output-file="pspp-cairo.ps"
 
+odt:odt:listing:
+
 # Devices that support the IBM PC line-drawing characters.
 define ibmpc-graphics \
   box[0000]='\x20' box[0001]='\xb3' box[0002]='\xba' \
diff --git a/configure.ac b/configure.ac
index 77519330..d52b4ffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_ARG_WITH([cairo],
   [], [with_cairo=yes])
 AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no])
 if test "$with_cairo" != no; then
-  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo], 
+  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.20 pangocairo], 
     [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"
      AC_DEFINE([HAVE_CAIRO], 1, 
        [Define to 1 if Cairo and Pango are available.])],
diff --git a/src/output/automake.mk b/src/output/automake.mk
index 1edc5bf7..34aac525 100644
--- a/src/output/automake.mk
+++ b/src/output/automake.mk
@@ -2,6 +2,8 @@
 
 noinst_LTLIBRARIES += src/output/liboutput.la 
 
+src_output_liboutput_la_CPPFLAGS = $(LIBXML2_CFLAGS) $(AM_CPPFLAGS) 
+
 src_output_liboutput_la_SOURCES = \
 	src/output/afm.c \
 	src/output/afm.h \
@@ -26,6 +28,7 @@ src_output_liboutput_la_SOURCES = \
 	src/output/journal.h \
 	src/output/manager.c \
 	src/output/manager.h \
+	src/output/odt.c \
 	src/output/output.c \
 	src/output/output.h \
 	src/output/postscript.c \
diff --git a/src/output/output.c b/src/output/output.c
index 1b8fe97b..a556ad81 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -230,6 +230,7 @@ outp_init (void)
 #ifdef HAVE_CAIRO
   add_class (&cairo_class);
 #endif
+  add_class (&odt_class);
 
   add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);
 }
diff --git a/src/output/output.h b/src/output/output.h
index ec9ae87d..8ae5c04b 100644
--- a/src/output/output.h
+++ b/src/output/output.h
@@ -175,5 +175,6 @@ extern const struct outp_class postscript_class;
 #ifdef HAVE_CAIRO
 extern const struct outp_class cairo_class;
 #endif
+extern const struct outp_class odt_class;
 
 #endif /* output/output.h */
-- 
2.30.2