diff --git a/ChangeLog b/ChangeLog
index 943c20dcc..f53824768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2014-03-05  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/configure.raw: Simplify.
+
 2014-03-05  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	Fix a bug in configure in library dependency setting
+	Reported in https://bugs.freedesktop.org/show_bug.cgi?id=75652.
 
 	* builds/unix/configure.raw: Use `x"${xxx}" != xno' style.
 
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 4b38e9707..121316ffa 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -982,20 +982,20 @@ AC_SUBST([build_libtool_libs])
 # changing LDFLAGS value should only be done after
 # lt_cv_prog_compiler_static_works test
 
-if test x"$have_zlib" != xno; then
+if test "$have_zlib" != no; then
   CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
   LDFLAGS="$LDFLAGS $ZLIB_LIBS"
 fi
 
-if test x"$have_bzip2" != xno; then
+if test "$have_bzip2" != no; then
   CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
   LDFLAGS="$LDFLAGS $BZIP2_LIBS"
 fi
-if test x"$have_libpng" != xno; then
+if test "$have_libpng" != no; then
   CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
   LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
 fi
-if test x"$have_harfbuzz" != xno; then
+if test "$have_harfbuzz" != no; then
   CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ"
   LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS"
 fi