pixman: Branch 'master'

[Søren Sandmann Pedersen]

 configure.ac |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit a56df9149d2af0414ba8311b413dbc2f01c94427
Author: Richard Hult <richard at imendio.com>
Date:   Sat May 3 15:03:00 2008 -0400

    Add --disable-gtk switch to configure
    
    Signed-off-by: Søren Sandmann <sandmann at redhat.com>

diff --git a/configure.ac b/configure.ac
index 637f835..d80022b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,7 +237,17 @@ dnl ========================================================
 AC_SUBST(MMX_CFLAGS)
 AC_SUBST(SSE_CFLAGS)
 
-PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
+AC_ARG_ENABLE(gtk,
+   [AC_HELP_STRING([--disable-gtk],
+                   [disable tests using GTK+])],
+   [disable_gtk=yes], [disable_gtk=no])
+
+if test $disable_gtk = no ; then
+   PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
+else
+   HAVE_GTK=no
+fi
+
 AM_CONDITIONAL(HAVE_GTK, [test "x$HAVE_GTK" = xyes])
 
 AC_SUBST(GTK_CFLAGS)