[cairo-commit] 2 commits - configure.in src/Makefile.am

[Carl Worth]

 configure.in    |    6 +-----
 src/Makefile.am |    3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
diff-tree 332c38b6c34bde4829607e534f39522f8001acf7 (from 2242550b489472d4d9b6505fd3db89541e101425)
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Mar 15 23:25:06 2007 -0700

    Avoid pulling in -lz for the ps backend.
    
    Quite some time ago we switched from using deflate-based compression to LZW
    for the ps backend, (which allows it to target PostScript Level 2 instead of
    PostScript Level 3). Now, we finally drop the fact that the ps backend was
    still requiring zlib in order to build.

diff --git a/configure.in b/configure.in
index 0b3e9fa..d65c17e 100644
--- a/configure.in
+++ b/configure.in
@@ -500,11 +500,7 @@ AM_CONDITIONAL(HAVE_PTHREAD, test "x$hav
 
 dnl ===========================================================================
 
-CAIRO_BACKEND_ENABLE(ps, PostScript, ps, PS_SURFACE, auto, [
-    # The postscript backend requires zlib.
-    use_ps=$have_libz
-    ps_NONPKGCONFIG_LIBS=-lz
-])
+CAIRO_BACKEND_ENABLE(ps, PostScript, ps, PS_SURFACE, auto, [use_ps=yes])
 
 dnl ===========================================================================
 
diff-tree 2242550b489472d4d9b6505fd3db89541e101425 (from 1234064fa4aa20d0875473709d2fa74600af485b)
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Mar 15 23:17:19 2007 -0700

    Make compilation of cairo-deflate-stream.c conditional on compilation of PDF backend.
    
    Otherwise we risk pulling in an otherwise-unneeded dependency on zlib.
    
    This fixes the bug reported here:
    
    	Without PDF surface backend we don't need cairo-deflate-stream
    	https://bugs.freedesktop.org/show_bug.cgi?id=10202

diff --git a/src/Makefile.am b/src/Makefile.am
index 22baab6..a5e856a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ endif
 
 if CAIRO_HAS_PDF_SURFACE
 libcairo_pdf_headers = cairo-pdf.h
-libcairo_pdf_sources = cairo-pdf-surface.c cairo-pdf-test.h
+libcairo_pdf_sources = cairo-pdf-surface.c cairo-deflate-stream.c cairo-pdf-test.h
 libcairo_font_subset_sources =	$(font_subset_sources)
 backend_pkgconfigs += cairo-pdf.pc
 endif
@@ -174,7 +174,6 @@ libcairo_la_SOURCES =				\
 	cairo-clip-private.h			\
 	cairo-color.c				\
 	cairo-debug.c				\
-	cairo-deflate-stream.c			\
 	cairo-fixed.c				\
 	cairo-font.c				\
 	cairo-font-options.c			\