[poppler] poppler: configure.ac,1.70.2.1,1.70.2.2

[Albert Astals Cid]

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

Modified Files:
      Tag: xpdf302merge
	configure.ac 
Log Message:
bring it in sync to HEAD changes


Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.70.2.1
retrieving revision 1.70.2.2
diff -u -d -r1.70.2.1 -r1.70.2.2
--- configure.ac	31 Mar 2007 23:46:31 -0000	1.70.2.1
+++ configure.ac	15 Apr 2007 00:09:18 -0000	1.70.2.2
@@ -255,6 +255,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],
@@ -321,6 +335,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"