[poppler] poppler: ChangeLog,1.256,1.257 configure.ac,1.38,1.39

[Kristian Høgsberg]

Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv29237

Modified Files:
	ChangeLog configure.ac 
Log Message:
2005-12-09  Kristian Høgsberg  <krh at redhat.com>

        * configure.ac:
        * poppler/Makefile.am (poppler_includedir):
        * goo/Makefile.am (poppler_goo_include_HEADERS): Make installation
        of xpdf header files optional.



Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- ChangeLog	8 Dec 2005 18:17:42 -0000	1.256
+++ ChangeLog	9 Dec 2005 19:40:40 -0000	1.257
@@ -1,3 +1,10 @@
+2005-12-09  Kristian Høgsberg  <krh at 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 at 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().
 

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- configure.ac	8 Dec 2005 18:17:42 -0000	1.38
+++ configure.ac	9 Dec 2005 19:40:40 -0000	1.39
@@ -24,6 +24,14 @@
 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]))