shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix PNG library handling.

* builds/unix/configure.raw: Don't use LIBPNG_LIBS but
LIBPNG_LDFLAGS.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2013-06-02  Werner Lemberg  <[email protected]>

+

+	Fix PNG library handling.

+

+	* builds/unix/configure.raw: Don't use LIBPNG_LIBS but

+	LIBPNG_LDFLAGS.

+

 2013-05-23  Behdad Esfahbod  <[email protected]>

 	Add support for color embedded bitmaps (eg. color emoji).

--- a/builds/unix/configure.raw

+++ b/builds/unix/configure.raw

@@ -287,17 +287,17 @@

                  [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 @@

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