From 382f3ef103f7d3599aec7fbdf99aa2e66bb0cbb5 Mon Sep 17 00:00:00 2001
From: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Date: Wed, 5 Mar 2014 10:19:15 +0900
Subject: [PATCH] Fix a bug in configure in library dependency setting

* builds/unix/configure.raw: Use `x"${xxx}" != xno' style.
---
 ChangeLog                 | 6 ++++++
 builds/unix/configure.raw | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4784912e8..943c20dcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-05  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Fix a bug in configure in library dependency setting
+
+	* builds/unix/configure.raw: Use `x"${xxx}" != xno' style.
+
 2014-03-04  Werner Lemberg  <wl@gnu.org>
 
 	Minor fix for `make devel'.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 5a125203c..4b38e9707 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 "$have_zlib" != no; then
+if test x"$have_zlib" != xno; then
   CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
   LDFLAGS="$LDFLAGS $ZLIB_LIBS"
 fi
 
-if test "$have_bzip2" != no; then
+if test x"$have_bzip2" != xno; then
   CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
   LDFLAGS="$LDFLAGS $BZIP2_LIBS"
 fi
-if test x"$have_libpng" != no; then
+if test x"$have_libpng" != xno; then
   CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
   LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
 fi
-if test x"$have_harfbuzz" != no; then
+if test x"$have_harfbuzz" != xno; then
   CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ"
   LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS"
 fi