summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac8
-rw-r--r--goo/Makefile.am4
-rw-r--r--poppler/Makefile.am4
4 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b3dc88c0..d668ba72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-09 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac:
+ * poppler/Makefile.am (poppler_includedir):
+ * goo/Makefile.am (poppler_goo_include_HEADERS): Make installation
+ of xpdf header files optional.
+
2005-12-08 Albert Astals Cid <aacid@kde.org>
* configure.ac: Detect if gettimeofday is available, fixes for correct
@@ -23,7 +30,8 @@
* poppler/PDFDoc.cc: Remove the version check.
* qt4/src/poppler-document.cc:
- qt4/src/poppler-qt4.h: add in a new method infoKeys() - to get metadata keys
+ * qt4/src/poppler-qt4.h: add in a new method infoKeys() - to get
+ metadata keys
* qt4/tests/check_metadata.cpp: add unit test for infoKeys().
diff --git a/configure.ac b/configure.ac
index 52345b75..e7f6ee36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,14 @@ AC_DEFINE([OPI_SUPPORT], [1], [Generate OPI comments in PS output.])
AC_DEFINE([MULTITHREADED], [1], [Enable multithreading support.])
AC_DEFINE([TEXTOUT_WORD_LIST], [1], [Enable word list support.])
+dnl Install xpdf headers
+AC_ARG_ENABLE(xpdf-headers,
+ AC_HELP_STRING([--enable-xpdf-headers],
+ [Install unsupported xpdf headers.]),
+ enable_xpdf_headers=$enableval,
+ enable_xpdf_headers="no")
+AM_CONDITIONAL(ENABLE_XPDF_HEADERS, test x$enable_xpdf_headers = xyes)
+
AC_ARG_ENABLE(fixedpoint,
[ --enable-fixedpoint use fixed point (instead of floating point) arithmetic],
AC_DEFINE(USE_FIXEDPOINT, [], [Use fixed point arithmetic]))
diff --git a/goo/Makefile.am b/goo/Makefile.am
index 651172e6..8511cfd2 100644
--- a/goo/Makefile.am
+++ b/goo/Makefile.am
@@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libgoo.la
+if ENABLE_XPDF_HEADERS
+
poppler_goo_includedir = $(includedir)/poppler/goo
poppler_goo_include_HEADERS = \
GooHash.h \
@@ -13,6 +15,8 @@ poppler_goo_include_HEADERS = \
gfile.h \
FixedPoint.h
+endif
+
libgoo_la_SOURCES = \
gfile.cc \
gmempp.cc \
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 51ba9b70..42bc5bd5 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -92,6 +92,8 @@ libpoppler_la_LIBADD = \
$(zlib_libs) \
$(FREETYPE_LIBS)
+if ENABLE_XPDF_HEADERS
+
poppler_includedir = $(includedir)/poppler
poppler_include_HEADERS = \
$(splash_headers) \
@@ -148,6 +150,8 @@ poppler_include_HEADERS = \
XpdfPluginAPI.h \
poppler-config.h
+endif
+
libpoppler_la_SOURCES = \
$(splash_sources) \
$(cairo_sources) \