Untitled

Index: autogen.sh
===================================================================
--- autogen.sh  (revision 100630)
+++ autogen.sh  (working copy)
@@ -125,18 +125,12 @@
 echo "Running autoconf ..."
 autoconf || { echo "**Error**: autoconf failed."; exit 1; }

-#if test -d $srcdir/libpixman; then
-#  echo Running libpixman/autogen.sh ...
-#  (cd $srcdir/libpixman ; NOCONFIGURE=1 ./autogen.sh "$@")
-#  echo Done running autogen.sh in libpixman...
-#fi
-
 CONF_OPTIONS=""
 CAIRO_AUTOGEN_REQUIRED=1
 until [ -z "$1" ]
 do
   if [ "$1" = "--with-cairo=system" ]; then
-    echo Skipping internal cairo/autogen.sh ...
+    echo Skipping internal pixman and cairo ...
     CAIRO_AUTOGEN_REQUIRED=0
   fi
   CONF_OPTIONS="$CONF_OPTIONS $1"
@@ -144,10 +138,15 @@
 done

 if test "$CAIRO_AUTOGEN_REQUIRED" -eq 1; then
+  if test -d $srcdir/pixman; then
+    echo Running pixman/autogen.sh ...
+    (cd $srcdir/pixman ; NOCONFIGURE=1 ./autogen.sh "$@")
+    echo Done running autogen.sh in pixman...
+  fi
   if test -d $srcdir/cairo; then
     echo Running cairo/autogen.sh ...
-    (cd $srcdir/cairo ; NOCONFIGURE=1 ./autogen.sh "$@")
-    echo Done running autogen.sh in cairo...
+     (cd $srcdir/cairo ; NOCONFIGURE=1 ./autogen.sh "$@")
+     echo Done running autogen.sh in cairo...
   fi
 fi

Index: configure.in
===================================================================
--- configure.in        (revision 100630)
+++ configure.in        (working copy)
@@ -30,13 +30,15 @@
        ac_configure_args="$ac_configure_args --with-pic=yes"

        # disable the PNG, PDF and SVG surface backends of Cairo (unrequired for GDI+)
-       ac_configure_args="$ac_configure_args --disable-png --disable-pdf --disable-svg"
+# cairo 1.6.x bug - we can't disable PDF and keep PS backend - reported at https://bugs.freedesktop.org/show_bug.cgi?id=15532
+#      ac_configure_args="$ac_configure_args --disable-png --disable-pdf --disable-svg"
+       ac_configure_args="$ac_configure_args --disable-png --disable-svg"

-       AC_CONFIG_SUBDIRS(cairo)
-       CAIRO_DIR="cairo"
+       AC_CONFIG_SUBDIRS([pixman cairo])
+       CAIRO_DIR="pixman cairo"
        CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
-       CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src'
-       AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
+       CAIRO_CFLAGS='-I$(top_builddir)/pixman/pixman -I$(top_srcdir)/pixman/pixman -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src'
+       AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo/pixman bundled in libgdiplus])

        if test $text_v = "pango"; then
                AC_MSG_ERROR("Pango text rendering is only possible with --with-cairo=system")