minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

Fix PNG library handling. 

* builds/unix/configure.raw: Don't use LIBPNG_LIBS but
LIBPNG_LDFLAGS.
This commit is contained in:
Werner Lemberg 2013-06-02 23:38:13 +02:00
parent 760d342d37
commit f9cceeb4e3
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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).

10
builds/unix/configure.raw
View File

@ -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])