--- cairo-1.2.2/configure.ac.orig	2006-08-08 23:05:54.000000000 +0000
+++ cairo-1.2.2/configure.ac	2006-08-09 07:42:54.315971000 +0000
@@ -227,7 +227,7 @@
 		     if test "x$no_x" = xyes; then
 		       use_xlib="no (requires X development libraries)"
 		     else
-		       xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+		       xlib_NONPKGCONFIG_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
 		       xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
 		     fi])
 ])
--- cairo-1.8.8/configure.ac~	2010-01-28 11:11:34.663816129 +0100
+++ cairo-1.8.8/configure.ac	2010-01-28 11:13:43.651094955 +0100
@@ -161,7 +161,7 @@
   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 ; do
+    for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
       if $PKG_CONFIG --exists $l ; then
         png_REQUIRES=$l
         use_png=yes