diff -u -ruN rhythmbox-0.8.8.orig/configure.ac rhythmbox-0.8.8/configure.ac
--- rhythmbox-0.8.8.orig/configure.ac	2004-10-05 14:06:30.000000000 -0400
+++ rhythmbox-0.8.8/configure.ac	2005-06-29 19:10:54.000000000 -0400
@@ -339,8 +339,12 @@
 
 AC_PATH_X
 
-CFLAGS="-I$x_includes $CFLAGS"
-LIBS="-L$x_libraries $LIBS"
+if test x"$x_includes" != x; then
+	CFLAGS="-I$x_includes $CFLAGS"
+fi
+if test x"$x_libraries" != x; then
+	LIBS="-L$x_libraries $LIBS"
+fi
 
 have_xidle=no
 AC_COMPILE_IFELSE([