aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2010-10-13 10:50:45 +0000
committerWillem Jan Palenstijn2010-10-13 10:50:45 +0000
commitb3c352d1fee37831408c43155cca91f3d8e42764 (patch)
treea01b357731336b423ccd1a79ceabeb7c4087de19 /configure
parent02322c562cfb27d7519a9ed86d1f2ff99cd379cc (diff)
downloadscummvm-rg350-b3c352d1fee37831408c43155cca91f3d8e42764.tar.gz
scummvm-rg350-b3c352d1fee37831408c43155cca91f3d8e42764.tar.bz2
scummvm-rg350-b3c352d1fee37831408c43155cca91f3d8e42764.zip
CONFIGURE: Don't execute a binary just to check libpng version
This fixes detection of libpng when cross-compiling. svn-id: r53404
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure b/configure
index cf761af03d..b705a8c859 100755
--- a/configure
+++ b/configure
@@ -2372,10 +2372,15 @@ if test "$_png" = auto ; then
_png=no
cat > $TMPC << EOF
#include <png.h>
-int main(void) { if (PNG_LIBPNG_VER >= 10208) { return 0; } return 1; }
+int main(void) {
+#if PNG_LIBPNG_VER >= 10208
+#else
+ syntax error
+#endif
+ return 0;
+}
EOF
- cc_check_no_clean $PNG_CFLAGS $PNG_LIBS -lpng && $TMPO$HOSTEXEEXT && _png=yes
- cc_check_clean
+ cc_check $PNG_CFLAGS $PNG_LIBS -lpng && _png=yes
fi
if test "$_png" = yes ; then
LIBS="$LIBS $PNG_LIBS -lpng"