shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Ignore libpng-config under cross-building configuration,
because it will return the flags for the hosting environment.

* builds/unix/configure.raw: Ignore libpng-config when
`cross_compiling' == yes.

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

--- a/ChangeLog

+++ b/ChangeLog

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

+2013-07-30  suzuki toshiya  <[email protected]>

+

+	Ignore libpng-config under cross-building configuration,

+	because it will return the flags for the hosting environment.

+

+	* builds/unix/configure.raw: Ignore libpng-config when

+	`cross_compiling' == yes.

+

 2013-07-30  Behdad Esfahbod  <[email protected]>

 	Prevent division by zero by a transparent color.

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

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

@@ -292,6 +292,10 @@

       AC_MSG_ERROR([`libpng-config' not found;

 either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,

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

+    elif test ${cross_compiling} = yes; then

+      AC_MSG_ERROR([`libpng-config' should not be used in cross-building,

+set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment,

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

     fi

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

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