[cairo-commit] configure.ac

M. Joonas Pihlaja joonas at kemper.freedesktop.org
Sat Aug 28 22:12:50 PDT 2010


 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6eab5ee10c111cf87dcf62e3f639f44cfd1e5cf6
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date:   Sat Aug 28 13:39:21 2010 +0200

    build: prefer libpng14 over older versions
    
    Also move libpng to the front of the list, so that the default
    version of the system is first checked.

diff --git a/configure.ac b/configure.ac
index ce5afc1..beaad9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,7 +279,7 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
   if test "x$png_REQUIRES" = x; then
     # libpng13 is GnuWin32's libpng-1.2.8 :-(
-    for l in libpng12 libpng13 libpng10 libpng; do
+    for l in libpng libpng14 libpng12 libpng13 libpng10; do
       if $PKG_CONFIG --exists $l ; then
         png_REQUIRES=$l
         use_png=yes


More information about the cairo-commit mailing list