Commit a32758f27cb6ff43d652f4e301c24f8b05307cdf
2014-03-05T08:02:46
* builds/unix/configure.raw: Simplify.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
diff --git a/ChangeLog b/ChangeLog
index 943c20d..f538247 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 4b38e97..121316f 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