--- cairo-1.0.0/src/Makefile.in.orig	2005-10-01 21:15:49.000000000 +0200
+++ cairo-1.0.0/src/Makefile.in	2005-10-01 21:19:05.000000000 +0200
@@ -771,10 +771,7 @@
 	(echo EXPORTS; \
 	cat $(cairo_win32_api_headers) | \
 	grep -v -E '^# *include' | \
-	gcc \
-	    -DCAIRO_HAS_WIN32_SURFACE \
-	    -DCAIRO_HAS_WIN32_FONT \
-	    -DCAIRO_HAS_PNG_FUNCTIONS \
+	gcc `sed -ne 's|.*\(CAIRO_HAS_\w\+\).*|-D\1|p' cairo-features.h` \
 	    -E - | \
 	grep -E '^cairo_.* \(' | \
 	sed -e 's/\([^ ]*\).*/\1/' | \
--- cairo-1.0.0/src/Makefile.am.orig	2005-10-01 21:19:37.000000000 +0200
+++ cairo-1.0.0/src/Makefile.am	2005-10-01 21:19:48.000000000 +0200
@@ -160,10 +160,7 @@
 	(echo EXPORTS; \
 	cat $(cairo_win32_api_headers) | \
 	grep -v -E '^# *include' | \
-	gcc \
-	    -DCAIRO_HAS_WIN32_SURFACE \
-	    -DCAIRO_HAS_WIN32_FONT \
-	    -DCAIRO_HAS_PNG_FUNCTIONS \
+	gcc `sed -ne 's|.*\(CAIRO_HAS_\w\+\).*|-D\1|p' cairo-features.h` \
 	    -E - | \
 	grep -E '^cairo_.* \(' | \
 	sed -e 's/\([^ ]*\).*/\1/' | \