ref: a32758f27cb6ff43d652f4e301c24f8b05307cdf
parent: 382f3ef103f7d3599aec7fbdf99aa2e66bb0cbb5
author: Werner Lemberg <[email protected]>
date: Wed Mar 5 03:02:46 EST 2014
* builds/unix/configure.raw: Simplify.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2014-03-05 Werner Lemberg <[email protected]>
+
+ * builds/unix/configure.raw: Simplify.
+
2014-03-05 suzuki toshiya <[email protected]>
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.--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -982,20 +982,20 @@
# 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