cairo/cairo-1.10.2.configure_ac.patch

   1 --- misc/cairo-1.10.2/configure.ac      2010-12-13 17:30:14.000000000 +0100
   2 +++ misc/build/cairo-1.10.2/configure.ac        2010-12-13 17:30:14.000000000 +0100
   3 @@ -33,13 +33,8 @@
   4
   5  dnl ===========================================================================
   6
   7 -AC_CHECK_LIB(z, compress,
   8 -        [AC_CHECK_HEADER(zlib.h, [
   9           have_libz=yes
  10           AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available])
  11 -        ],
  12 -        [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])],
  13 -        [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])
  14
  15  AC_CHECK_LIB(dl, dlsym,
  16              [have_dlsym=yes; have_dl=yes],
  17 @@ -279,7 +271,7 @@
  18    AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
  19    if test "x$png_REQUIRES" = x; then
  20      # libpng13 is GnuWin32's libpng-1.2.8 :-(
  21 -    for l in libpng libpng14 libpng12 libpng13 libpng10; do
  22 +    for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do
  23        if $PKG_CONFIG --exists $l ; then
  24          png_REQUIRES=$l
  25          use_png=yes
  26 @@ -455,7 +455,7 @@
  27         AX_COMPARE_VERSION([$FREETYPE_VERSION], [gt], [$FREETYPE_MIN_VERSION],
  28                            [AC_MSG_RESULT($FREETYPE_VERSION - OK)
  29                            ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
  30 -                          ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs`],
  31 +                          ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs | $SED -e 's/-lz//g'`],
  32                            [AC_MSG_RESULT($FREETYPE_VERSION - Too old)
  33                            use_ft="no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"])
  34        fi
  35 @@ -462,7 +462,7 @@
  36      fi
  37
  38    ft_CFLAGS="$FREETYPE_CFLAGS"
  39 -  ft_LIBS="$FREETYPE_LIBS"
  40 +  ft_LIBS=`echo "$FREETYPE_LIBS" | $SED -e 's/-lz//g'`
  41  ])
  42
  43  FONTCONFIG_MIN_VERSION=2.2.95
  44 @@ -505,7 +505,7 @@
  45  CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [
  46      # The ps backend requires zlib.
  47      use_ps=$have_libz
  48 -    ps_NONPKGCONFIG_LIBS=-lz
  49 +    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
  50  ])
  51
  52  dnl ===========================================================================
  53 @@ -542,7 +542,7 @@
  54  CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [
  55      # The pdf backend requires zlib.
  56      use_pdf=$have_libz
  57 -    pdf_NONPKGCONFIG_LIBS=-lz
  58 +    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
  59  ])
  60
  61  dnl ===========================================================================
  62 @@ -623,7 +623,7 @@
  63  CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no)
  64  CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [
  65      use_xml=$have_libz
  66 -    xml_NONPKGCONFIG_LIBS=-lz
  67 +    xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
  68  ])
  69
  70  dnl ===========================================================================