From 2b29ed660afe5d4c6ee5762527d0b853b3682839 Mon Sep 17 00:00:00 2001 From: suzuki toshiya Date: Tue, 30 Jul 2013 13:55:29 +0900 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ builds/unix/configure.raw | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 47453ce76..f3dc66264 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-07-30 suzuki toshiya + + 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 Prevent division by zero by a transparent color. diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 6a6edc715..9798dbe8c 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -291,6 +291,10 @@ if test x$with_png != xno; then if ! which libpng-config >/dev/null; then 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`"