[cairo-commit] configure.in

Behdad Esfahbod behdad at kemper.freedesktop.org
Tue Jul 11 06:23:35 PDT 2006


 configure.in |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

New commits:
diff-tree d27a00874bc044b4c9aefacbc850d5f7ee106b6f (from e0ad1aa995bcec4246c0b8ab0d5a5a79871ce235)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 11 09:23:18 2006 -0400

    Disable PDF backend if zlib not found.
    Explicitly add -lm to CAIRO_LIBS

diff --git a/configure.in b/configure.in
index 0fa411a..b249d8e 100644
--- a/configure.in
+++ b/configure.in
@@ -182,7 +182,7 @@ AC_DEFUN([CAIRO_BACKEND_ENABLE],
 CAIRO_FEATURES=""
 CAIRO_REQUIRES=""
 CAIRO_CFLAGS=""
-CAIRO_LIBS=""
+CAIRO_LIBS="-lm"
 
 dnl ===========================================================================
 
@@ -442,7 +442,7 @@ CAIRO_BACKEND_ENABLE(ps, PostScript, ps,
   if test x"$have_ft_load_sfnt_table" != "xyes" ; then
     use_ps="no (requires FreeType 2.1.4 or newer)"
   else
-    # The postscript module requires zlib.
+    # The postscript backend requires zlib.
     AC_CHECK_LIB(z, compress,
                  [AC_CHECK_HEADER(zlib.h, [],
 		 [use_ps="no (requires zlib http://www.gzip.org/zlib/)"])],
@@ -456,8 +456,14 @@ dnl ====================================
 CAIRO_BACKEND_ENABLE(pdf, PDF, pdf, PDF_SURFACE, auto, [], [
   if test x"$have_ft_load_sfnt_table" != "xyes" ; then
     use_pdf="no (requires FreeType 2.1.4 or newer)"
+  else
+    # The pdf backend requires zlib.
+    AC_CHECK_LIB(z, compress,
+                 [AC_CHECK_HEADER(zlib.h, [],
+		 [use_ps="no (requires zlib http://www.gzip.org/zlib/)"])],
+		 [use_ps="no (requires zlib http://www.gzip.org/zlib/)"])
+    pdf_LIBS=-lz
   fi
-  pdf_LIBS=-lz
 ])
 
 test_pdf=no


More information about the cairo-commit mailing list