diff --git a/configure.in b/configure.in
index 9fd1942db..c3f7b4ffb 100644
--- a/configure.in
+++ b/configure.in
@@ -236,10 +236,10 @@ CAIRO_LIBS=$CAIRO_NONPKGCONFIG_LIBS
 
 dnl ===========================================================================
 
-PKG_CHECK_MODULES(PIXMAN, pixman >= 0.9.2)
+PIXMAN_REQUIRES="pixman >= 0.9.2"
+PKG_CHECK_MODULES(PIXMAN,  $PIXMAN_REQUIRES)
 
-CAIRO_NONPKGCONFIG_CFLAGS="PIXMAN_CFLAGS $CAIRO_NONPKGCONFIG_CFLAGS"
-CAIRO_NONPKGCONFIG_LIBS="PIXMAN_LIBS $CAIRO_NONPKGCONFIG_LIBS"
+CAIRO_REQUIRES="$PIXMAN_REQUIRES $CAIRO_REQUIRES"
 CAIRO_CFLAGS="$PIXMAN_CFLAGS $CAIRO_CFLAGS"
 CAIRO_LIBS="$PIXMAN_LIBS $CAIRO_LIBS"
 
@@ -703,7 +703,6 @@ AC_CACHE_CHECK([for supported warning flags], cairo_cv_warn_cflags, [
 	AC_MSG_CHECKING([which warning flags were supported])])
 WARN_CFLAGS="$cairo_cv_warn_cflags"
 CAIRO_CFLAGS="$CAIRO_CFLAGS $WARN_CFLAGS"
-PIXMAN_CFLAGS="$PIXMAN_CFLAGS $WARN_CFLAGS"
 
 # We only wish to enable attribute(warn_unused_result) if we can prevent
 # gcc from generating thousands of warnings about the misapplication of the
@@ -720,8 +719,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$warn_unused_result],
 AC_MSG_RESULT([$warn_unused_result])
 
 CAIRO_CC_TRY_FLAG([-fno-strict-aliasing],
-		  [CAIRO_CFLAGS="$CAIRO_CFLAGS -fno-strict-aliasing"
-		   PIXMAN_CFLAGS="$PIXMAN_CFLAGS -fno-strict-aliasing"])
+		  [CAIRO_CFLAGS="$CAIRO_CFLAGS -fno-strict-aliasing"])
 
 AC_SUBST(CAIRO_REQUIRES)
 AC_SUBST(CAIRO_NONPKGCONFIG_CFLAGS)
@@ -729,8 +727,6 @@ AC_SUBST(CAIRO_NONPKGCONFIG_LIBS)
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LDADD)
 AC_SUBST(CAIRO_LIBS)
-AC_SUBST(PIXMAN_CFLAGS)
-AC_SUBST(PIXMAN_LDADD)
 AC_SUBST(CAIROPERF_LIBS)
 
 dnl ===========================================================================
@@ -771,15 +767,6 @@ int main () {
 CFLAGS=$xserver_save_CFLAGS
 AC_MSG_RESULT($have_mmx_intrinsics)
 
-if test $have_mmx_intrinsics = yes ; then
-   AC_DEFINE(USE_MMX, 1, [use MMX compiler intrinsics])
-else
-   MMX_CFLAGS=
-fi
-PIXMAN_CFLAGS="$PIXMAN_CFLAGS $MMX_CFLAGS"
-
-AM_CONDITIONAL(USE_MMX, test $have_mmx_intrinsics = yes)
-
 dnl ===========================================================================
 
 AC_ARG_ENABLE(gcov,
@@ -842,14 +829,11 @@ dnl  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir)
   changequote({,})
   CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
   CAIRO_CFLAGS=`echo "$CAIRO_CFLAGS" | $SED -e 's/-O[0-9]*//g'`
-  PIXMAN_CFLAGS=`echo "$PIXMAN_CFLAGS" | $SED -e 's/-O[0-9]*//g'`
   changequote([,])
 
   dnl Add the special gcc flags
   CAIRO_CFLAGS="$CAIRO_CFLAGS -O0 -fprofile-arcs -ftest-coverage"
   CAIRO_LDADD="$CAIRO_LDADD -lgcov"
-  PIXMAN_CFLAGS="$PIXMAN_CFLAGS -O0 -fprofile-arcs -ftest-coverage"
-  PIXMAN_LDADD="$PIXMAN_LDADD -lgcov"
 fi
 
 dnl ===========================================================================