shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix Savannah bug #39804.

* builds/unix/configure.raw (LIBPNG): Define and export.
* builds/unix/freetype-config.in, builds/unix/freetype2.in: Handle
libpng.

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

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2013-08-18  Werner Lemberg  <[email protected]>

+

+	Fix Savannah bug #39804.

+

+	* builds/unix/configure.raw (LIBPNG): Define and export.

+	* builds/unix/freetype-config.in, builds/unix/freetype2.in: Handle

+	libpng.

+

 2013-08-17  Alexei Podtelezhnikov  <[email protected]>

 	[base] Clean up BBox_Conic_Check.

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

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

@@ -297,6 +297,7 @@

 either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,

 or pass `--without-png' to the `configure' script.])

     fi

+    LIBPNG="`libpng-config --libs`"

     LIBPNG_CFLAGS="`libpng-config --cflags`"

     LIBPNG_LDFLAGS="`libpng-config --ldflags`"

   fi

@@ -721,6 +722,7 @@

 AC_SUBST([ftmac_c])

 AC_SUBST([LIBZ])

 AC_SUBST([LIBBZ2])

+AC_SUBST([LIBPNG])

 AC_SUBST([FT2_EXTRA_LIBS])

 AC_SUBST([SYSTEM_ZLIB])

--- a/builds/unix/freetype-config.in

+++ b/builds/unix/freetype-config.in

@@ -141,7 +141,7 @@

 fi

 if test "$echo_libs" = "yes" ; then

-  libs="-lfreetype %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%"

+  libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%"

   if test "${SYSROOT}$libdir" != "/usr/lib"  &&

      test "${SYSROOT}$libdir" != "/usr/lib64"; then

     echo -L${SYSROOT}$libdir $libs

--- a/builds/unix/freetype2.in

+++ b/builds/unix/freetype2.in

@@ -8,5 +8,5 @@

 Version: %ft_version%

 Requires:

 Libs: -L${libdir} -lfreetype

-Libs.private: %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%

+Libs.private: %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%

 Cflags: -I${includedir}/freetype2 -I${includedir}

--- a/builds/unix/unix-def.in

+++ b/builds/unix/unix-def.in

@@ -63,6 +63,7 @@

 FT2_EXTRA_LIBS     := @FT2_EXTRA_LIBS@

 LIBBZ2             := @LIBBZ2@

 LIBZ               := @LIBZ@

+LIBPNG             := @LIBPNG@

 build_libtool_libs := @build_libtool_libs@

 ft_version         := @ft_version@

@@ -102,6 +103,7 @@

 	sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \

 	    -e 's|%LIBBZ2%|$(LIBBZ2)|' \

 	    -e 's|%LIBZ%|$(LIBZ)|' \

+	    -e 's|%LIBPNG%|$(LIBPNG)|' \

 	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \

 	    -e 's|%exec_prefix%|$(exec_prefix)|' \

 	    -e 's|%ft_version%|$(ft_version)|' \

@@ -119,6 +121,7 @@

 	sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \

 	    -e 's|%LIBBZ2%|$(LIBBZ2)|' \

 	    -e 's|%LIBZ%|$(LIBZ)|' \

+	    -e 's|%LIBPNG%|$(LIBPNG)|' \

 	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \

 	    -e 's|%exec_prefix%|$(exec_prefix)|' \

 	    -e 's|%ft_version%|$(ft_version)|' \