Patch attached. It only changes configure.ac and the relevant Makefile.ams.
Best,
Dom
On 4/3/07, Jeff Muizelaar <[EMAIL PROTECTED]> wrote:
On Tue, Apr 03, 2007 at 02:32:07PM -0400, Dominic Lachowicz wrote:
> For the time being, I can make building pdf2abw contingent on finding
> these dependencies if someone wants.
Yes please. If you do that, I'll commit the patch.
-Jeff
--
Counting bodies like sheep to the rhythm of the war drums.
? abiword-output.patch
? poppler/ABWOutputDev.cc
? poppler/ABWOutputDev.h
? utils/pdftoabw
? utils/pdftoabw.cc
Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 configure.ac
--- configure.ac 7 Mar 2007 19:15:32 -0000 1.70
+++ configure.ac 4 Apr 2007 01:07:11 -0000
@@ -251,6 +251,20 @@ elif test x$enable_gtk_test = xtry; then
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 ""
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"
Index: poppler/Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Makefile.am,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile.am
--- poppler/Makefile.am 4 Mar 2007 07:30:31 -0000 1.29
+++ poppler/Makefile.am 4 Apr 2007 01:07:11 -0000
@@ -73,12 +73,27 @@ zlib_libs = \
endif
+if BUILD_ABIWORD_OUTPUT
+
+abiword_sources = \
+ ABWOutputDev.h \
+ ABWOutputDev.cc
+
+abiword_includes = \
+ $(ABIWORD_CFLAGS)
+
+abiword_libs = \
+ $(ABIWORD_LIBS)
+
+endif
+
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/goo \
$(splash_includes) \
$(cairo_includes) \
$(arthur_includes) \
+ $(abiword_includes) \
$(FREETYPE_CFLAGS) \
$(FONTCONFIG_CFLAGS)
@@ -94,6 +109,7 @@ libpoppler_la_LIBADD = \
$(cairo_libs) \
$(libjpeg_libs) \
$(zlib_libs) \
+ $(abiword_libs) \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS)
@@ -169,6 +185,7 @@ libpoppler_la_SOURCES = \
$(arthur_sources) \
$(libjpeg_sources) \
$(zlib_sources) \
+ $(abiword_sources) \
Annot.cc \
Array.cc \
BuiltinFont.cc \
Index: utils/Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/utils/Makefile.am,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile.am
--- utils/Makefile.am 25 Sep 2006 20:43:18 -0000 1.10
+++ utils/Makefile.am 4 Apr 2007 01:07:12 -0000
@@ -10,12 +10,23 @@ pdftoppm_manpage = pdftoppm.1
endif
+if BUILD_ABIWORD_OUTPUT
+
+pdftoabw_SOURCES = \
+ pdftoabw.cc \
+ $(common)
+
+pdftoabw_binary = pdftoabw
+
+endif
+
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/utils \
-I$(top_srcdir)/poppler \
$(UTILS_CFLAGS) \
- $(FONTCONFIG_CFLAGS)
+ $(FONTCONFIG_CFLAGS) \
+ $(ABIWORD_CFLAGS)
LDADD = \
$(top_builddir)/poppler/libpoppler.la \
@@ -29,7 +40,8 @@ bin_PROGRAMS = \
pdftops \
pdftotext \
pdftohtml \
- $(pdftoppm_binary)
+ $(pdftoppm_binary) \
+ $(pdftoabw_binary)
dist_man1_MANS = \
pdffonts.1 \
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
