Fix PNG library handling. * builds/unix/configure.raw: Don't use LIBPNG_LIBS but LIBPNG_LDFLAGS.
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 46 47 48 49 50
diff --git a/ChangeLog b/ChangeLog
index 108ea73..85e9d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-02 Werner Lemberg <wl@gnu.org>
+
+ Fix PNG library handling.
+
+ * builds/unix/configure.raw: Don't use LIBPNG_LIBS but
+ LIBPNG_LDFLAGS.
+
2013-05-23 Behdad Esfahbod <behdad@google.com>
Add support for color embedded bitmaps (eg. color emoji).
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 3d6e901..51e0c36 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -287,17 +287,17 @@ AC_ARG_WITH([png],
[do not support png compressed OpenType embedded bitmaps]))
if test x$with_png != xno; then
AC_MSG_CHECKING([for libpng])
- if test -z "$LIBPNG_CFLAGS" -a -z "$LIBPNG_LIBS"; then
+ if test -z "$LIBPNG_CFLAGS" -a -z "$LIBPNG_LDFLAGS"; then
if ! which libpng-config >/dev/null; then
AC_MSG_ERROR([`libpng-config' not found;
-either set the LIBPNG_CFLAGS and LIBPNG_LIBS environment variables,
+either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
or pass `--without-png' to the `configure' script.])
fi
LIBPNG_CFLAGS="`libpng-config --cflags`"
- LIBPNG_LIBS="`libpng-config --libs`"
+ LIBPNG_LDFLAGS="`libpng-config --ldflags`"
fi
HAVE_LIBPNG=yes
- AC_MSG_RESULT([$LIBPNG_LIBS])
+ AC_MSG_RESULT([$LIBPNG_LDFLAGS])
fi
@@ -739,7 +739,7 @@ if test x$SYSTEM_LIBBZ2 = xyes; then
fi
if test x$HAVE_LIBPNG = xyes; then
CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
- LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
+ LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS"
fi
AC_SUBST([CFLAGS])