[poppler] poppler/poppler: Makefile.am,1.15,1.16

[Kristian Høgsberg]

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

Modified Files:
	Makefile.am 
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: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	8 Dec 2005 12:42:51 -0000	1.15
+++ Makefile.am	9 Dec 2005 19:40:40 -0000	1.16
@@ -92,6 +92,8 @@
 	$(zlib_libs)				\
 	$(FREETYPE_LIBS)
 
+if ENABLE_XPDF_HEADERS
+
 poppler_includedir = $(includedir)/poppler
 poppler_include_HEADERS =	\
 	$(splash_headers)	\
@@ -148,6 +150,8 @@
 	XpdfPluginAPI.h		\
 	poppler-config.h
 
+endif
+
 libpoppler_la_SOURCES =		\
 	$(splash_sources)	\
 	$(cairo_sources)	\