[trunk] Import change from 1.5 branch over to trunk

[openjpeg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7e5dc5c82522404fab5324390a1ef4d3f478c0fe..6ed452f52b761659e6a5ee486150a5a35742df70 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-DISTCHECK_CONFIGURE_FLAGS = --enable-jpip=yes --enable-jpwl=yes --enable-mj2=yes
+DISTCHECK_CONFIGURE_FLAGS = --enable-jpip=yes --enable-jpip-server=yes --enable-jpwl=yes --enable-mj2=yes
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -12,7 +12,6 @@ pkgconfig_DATA += libopenjpeg-jpwl.pc
 endif
 
 
-
 MAINTAINERCLEANFILES = \
 Makefile.in \
 aclocal.m4 \
@@ -66,6 +65,9 @@ else
 endif
        @echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg1.pc" >> $(top_builddir)/report.txt
        @echo -e " (LN)\t$(pkgconfigdir)/libopenjpeg.pc" >> $(top_builddir)/report.txt
+if WANT_JPWL
+       @echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg-jpwl.pc" >> $(top_builddir)/report.txt
+endif
        @cat $(top_builddir)/report.txt
        @rm $(top_builddir)/report.txt