[poppler] poppler: ChangeLog,1.491,1.492 configure.ac,1.70,1.71

[Jeff Muizelaar]

Update of /cvs/poppler/poppler
In directory kemper:/tmp/cvs-serv6395

Modified Files:
	ChangeLog configure.ac 
Log Message:
2007-04-03  Jeff Muizelaar  <jeff at infidigm.net>

	* configure.ac:
	* poppler/ABWOutputDev.cc:
	* poppler/ABWOutputDev.h:
	* poppler/Makefile.am:
	* utils/Makefile.am:
	* utils/pdftoabw.cc: Add AbiWord output device and pdftoabw program.
	Patch by Jauco Noordzij. Autotools stuff by Dominic Lachowicz.


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -d -r1.491 -r1.492
--- ChangeLog	22 Mar 2007 20:56:24 -0000	1.491
+++ ChangeLog	4 Apr 2007 02:42:29 -0000	1.492
@@ -1,3 +1,13 @@
+2007-04-03  Jeff Muizelaar  <jeff at infidigm.net>
+
+	* configure.ac:
+	* poppler/ABWOutputDev.cc:
+	* poppler/ABWOutputDev.h:
+	* poppler/Makefile.am:
+	* utils/Makefile.am:
+	* utils/pdftoabw.cc: Add AbiWord output device and pdftoabw program.
+	Patch by Jauco Noordzij. Autotools stuff by Dominic Lachowicz.
+
 2007-03-22  Albert Astals Cid <aacid at kde.org>
 
 	* poppler/Gfx.cc: Accept reals for width and height of images. Fixes

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- configure.ac	7 Mar 2007 19:15:32 -0000	1.70
+++ configure.ac	4 Apr 2007 02:42:29 -0000	1.71
@@ -251,6 +251,20 @@
 fi
 AM_CONDITIONAL(BUILD_GTK_TEST, test x$enable_gtk_test = xyes)
 
+AC_ARG_ENABLE(abiword-output,
+              AC_HELP_STRING([--disable-abiword-output],
+                             [Don't build the abiword backend.]),
+              enable_abiword_output=$enableval,
+              enable_abiword_output="try")
+if test x$enable_abiword_output = xyes; then
+  PKG_CHECK_MODULES(ABIWORD, libxml-2.0)
+elif test x$enable_abiword_output = xtry; then
+  PKG_CHECK_MODULES(ABIWORD, libxml-2.0,
+                    [enable_abiword_output="yes"],
+                    [enable_abiword_output="no"])
+fi
+
+AM_CONDITIONAL(BUILD_ABIWORD_OUTPUT, test x$enable_abiword_output = xyes)
 
 AC_ARG_ENABLE(utils,
               AC_HELP_STRING([--disable-utils],
@@ -317,6 +331,7 @@
 echo "Building poppler with support for:"
 echo "  splash output:      $enable_splash_output"
 echo "  cairo output:       $enable_cairo_output"
+echo "  abiword output:     $enable_abiword_output"
 echo "  qt wrapper:         $enable_poppler_qt"
 echo "  qt4 wrapper:        $enable_poppler_qt4"
 echo "  glib wrapper:       $enable_poppler_glib"