From 0305fe55655ac01ad26f570c9d0ab2701dd804eb Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Tue, 15 Feb 2011 01:48:22 +0000
Subject: [PATCH] Add configure caching to speed up the build, and stop pixman
 and cairo for being configure twice

---
 autogen.sh        | 6 +++---
 m4/utilities.m4   | 2 +-
 pixman/autogen.sh | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 1b0cf909d..980d54b16 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -128,7 +128,7 @@ autoconf || { echo "**Error**: autoconf failed."; exit 1; }
 
 if test -d $srcdir/pixman; then
   echo Running pixman/autogen.sh ...
-  (cd $srcdir/pixman ; ./autogen.sh "$@")
+  (cd $srcdir/pixman ; NOCONFIGURE=1 ./autogen.sh "$@")
   echo Done running pixman/autogen.sh ...
 fi
 
@@ -146,7 +146,7 @@ if test -d $srcdir/cairo; then
       export PKG_CONFIG_PATH
   fi
 
-  (cd $srcdir/cairo ; ./autogen.sh "$@")
+  (cd $srcdir/cairo ; NOCONFIGURE=1 ./autogen.sh "$@")
 
   echo Done running cairo/autogen.sh ...
 fi
@@ -212,7 +212,7 @@ if [ $configure_gallium -eq 1 ] ; then
   fi
 fi
 
-conf_flags="--enable-maintainer-mode --enable-compile-warnings --with-sanity-checks" #--enable-iso-c
+conf_flags="--enable-maintainer-mode --enable-compile-warnings --with-sanity-checks -C" #--enable-iso-c
 
 if test x$NOCONFIGURE = x; then
   echo Running $srcdir/configure $conf_flags "$@" ...
diff --git a/m4/utilities.m4 b/m4/utilities.m4
index 55b26a5d7..640b08255 100644
--- a/m4/utilities.m4
+++ b/m4/utilities.m4
@@ -20,7 +20,7 @@ AC_CONFIG_SUBDIRS([$1])
 m4_ifblank([$2], [rm -f $1/configure.gnu],
     [AX_PRINT_TO_FILE([$1/configure.gnu],
 [#!/bin/sh
-./configure $2
+./configure $2 --cache-file=../config.cache
 ])
 ])
 
diff --git a/pixman/autogen.sh b/pixman/autogen.sh
index 354f254e4..81b05fd2f 100755
--- a/pixman/autogen.sh
+++ b/pixman/autogen.sh
@@ -9,4 +9,9 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure "$@"
+if test x$NOCONFIGURE = x; then
+  echo Running $srcdir/configure $conf_flags "$@" ...
+  $srcdir/configure "$@"
+else
+  echo Skipping configure process.
+fi