diff --git a/ChangeLog b/ChangeLog
index 941002c03..77cd708e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-09  Carl Worth  <cworth@cworth.org>
+
+	* configure.in:
+	* src/cairo-features.h.in: Change cairo-features again so that
+	either #if or #ifdef will work to test any feature.
+
 2005-05-07  Owen Taylor  <otaylor@redhat.com>
 
 	* doc/public/language-bindings.xml doc/public/cairo-doc.xml
diff --git a/configure.in b/configure.in
index 9693f0846..8d0a0ea19 100644
--- a/configure.in
+++ b/configure.in
@@ -65,9 +65,7 @@ fi
 
 AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, test "x$use_xlib" = "xyes")
 if test "x$use_xlib" = "xyes"; then
-  XLIB_SURFACE_FEATURE=1
-else
-  XLIB_SURFACE_FEATURE=0
+  XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1"
 fi
 AC_SUBST(XLIB_SURFACE_FEATURE)
 
@@ -87,10 +85,8 @@ fi
 
 AM_CONDITIONAL(CAIRO_HAS_QUARTZ_SURFACE, test "x$use_quartz" = "xyes")
 if test "x$use_quartz" = "xyes"; then
-  QUARTZ_SURFACE_FEATURE=1
+  QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1"
   QUARTZ_LIBS="-Xlinker -framework -Xlinker Carbon"
-else
-  QUARTZ_SURFACE_FEATURE=0
 fi
 AC_SUBST(QUARTZ_SURFACE_FEATURE)
 CAIRO_LIBS="$CAIRO_LIBS $QUARTZ_LIBS"
@@ -108,9 +104,7 @@ fi
 
 AM_CONDITIONAL(CAIRO_HAS_XCB_SURFACE, test "x$use_xcb" = "xyes")
 if test "x$use_xcb" = "xyes"; then
-  XCB_SURFACE_FEATURE=1
-else
-  XCB_SURFACE_FEATURE=0
+  XCB_SURFACE_FEATURE="#define CAIRO_HAS_XCB_SURFACE 1"
 fi
 AC_SUBST(XCB_SURFACE_FEATURE)
 
@@ -145,17 +139,13 @@ fi
 
 AM_CONDITIONAL(CAIRO_HAS_WIN32_SURFACE, test "x$use_win32" = "xyes")
 if test "x$use_win32" = "xyes"; then
-  WIN32_SURFACE_FEATURE=1
-else
-  WIN32_SURFACE_FEATURE=0
+  WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1"
 fi
 AC_SUBST(WIN32_SURFACE_FEATURE)
 
 AM_CONDITIONAL(CAIRO_HAS_WIN32_FONT, test "x$use_win32" = "xyes")
 if test "x$use_win32" = "xyes"; then
-  WIN32_FONT_FEATURE=1
-else
-  WIN32_FONT_FEATURE=0
+  WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
 fi
 AC_SUBST(WIN32_FONT_FEATURE)
 
@@ -173,10 +163,8 @@ AC_CHECK_LIB(z, compress,
 
 AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, test "x$use_ps" = "xyes")
 if test "x$use_ps" = "xyes"; then
-  PS_SURFACE_FEATURE=1
+  PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1"
   PS_LIBS=-lz
-else
-  PS_SURFACE_FEATURE=0
 fi
 AC_SUBST(PS_SURFACE_FEATURE)
 
@@ -211,9 +199,7 @@ fi
 
 AM_CONDITIONAL(CAIRO_HAS_PNG_FUNCTIONS, test "x$use_png" = "xyes")
 if test "x$use_png" = "xyes"; then
-  PNG_FUNCTIONS_FEATURE=1
-else
-  PNG_FUNCTIONS_FEATURE=0
+  PNG_FUNCTIONS_FEATURE="#define CAIRO_HAS_PNG_FUNCTIONS 1"
 fi
 AC_SUBST(PNG_FUNCTIONS_FEATURE)
 
@@ -236,9 +222,7 @@ fi
 
 AM_CONDITIONAL(CAIRO_HAS_GLITZ_SURFACE, test "x$use_glitz" = "xyes")
 if test "x$use_glitz" = "xyes"; then
-  GLITZ_SURFACE_FEATURE=1
-else
-  GLITZ_SURFACE_FEATURE=0
+  GLITZ_SURFACE_FEATURE="#define CAIRO_HAS_GLITZ_SURFACE 1"
 fi
 AC_SUBST(GLITZ_SURFACE_FEATURE)
 
@@ -317,9 +301,7 @@ CAIRO_LIBS="$CAIRO_LIBS $FREETYPE_LIBS"
 
 AM_CONDITIONAL(CAIRO_HAS_FT_FONT, test "x$use_freetype" = "xyes")
 if test "x$use_freetype" = "xyes"; then
-  FT_FONT_FEATURE=1
-else
-  FT_FONT_FEATURE=0
+  FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
 fi
 AC_SUBST(FT_FONT_FEATURE)
 
@@ -336,10 +318,8 @@ fi
 
 AM_CONDITIONAL(CAIRO_HAS_PDF_SURFACE, test "x$use_pdf" = "xyes")
 if test "x$use_pdf" = "xyes"; then
-  PDF_SURFACE_FEATURE=1
+  PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
   PDF_LIBS=-lz
-else
-  PDF_SURFACE_FEATURE=0
 fi
 AC_SUBST(PDF_SURFACE_FEATURE)
 
@@ -363,9 +343,7 @@ fi
 
 AM_CONDITIONAL(CAIRO_HAS_ATSUI_FONT, test "x$use_atsui" = "xyes")
 if test "x$use_atsui" = "xyes"; then
-  ATSUI_FONT_FEATURE=1
-else
-  ATSUI_FONT_FEATURE=0
+  ATSUI_FONT_FEATURE="#define CAIRO_HAS_ATSUI_FONT 1"
 fi
 AC_SUBST(ATSUI_FONT_FEATURE)
 
diff --git a/src/cairo-features.h.in b/src/cairo-features.h.in
index cc3d3e70b..8065be352 100644
--- a/src/cairo-features.h.in
+++ b/src/cairo-features.h.in
@@ -37,26 +37,26 @@
 #ifndef CAIRO_FEATURES_H
 #define CAIRO_FEATURES_H
 
-#define CAIRO_HAS_PS_SURFACE @PS_SURFACE_FEATURE@
+@PS_SURFACE_FEATURE@
 
-#define CAIRO_HAS_PDF_SURFACE @PDF_SURFACE_FEATURE@
+@PDF_SURFACE_FEATURE@
 
-#define CAIRO_HAS_XLIB_SURFACE @XLIB_SURFACE_FEATURE@
+@XLIB_SURFACE_FEATURE@
 
-#define CAIRO_HAS_QUARTZ_SURFACE @QUARTZ_SURFACE_FEATURE@
+@QUARTZ_SURFACE_FEATURE@
 
-#define CAIRO_HAS_XCB_SURFACE @XCB_SURFACE_FEATURE@
+@XCB_SURFACE_FEATURE@
 
-#define CAIRO_HAS_WIN32_SURFACE @WIN32_SURFACE_FEATURE@
+@WIN32_SURFACE_FEATURE@
 
-#define CAIRO_HAS_GLITZ_SURFACE @GLITZ_SURFACE_FEATURE@
+@GLITZ_SURFACE_FEATURE@
 
-#define CAIRO_HAS_FT_FONT @FT_FONT_FEATURE@
+@FT_FONT_FEATURE@
 
-#define CAIRO_HAS_WIN32_FONT @WIN32_FONT_FEATURE@
+@WIN32_FONT_FEATURE@
 
-#define CAIRO_HAS_ATSUI_FONT @ATSUI_FONT_FEATURE@
+@ATSUI_FONT_FEATURE@
 
-#define CAIRO_HAS_PNG_FUNCTIONS	@PNG_FUNCTIONS_FEATURE@
+@PNG_FUNCTIONS_FEATURE@
 
 #endif