[Scummvm-cvs-logs] SF.net SVN: scummvm:[53404] scummvm/trunk/configure

[wjpalenstijn at users.sourceforge.net]

Revision: 53404
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53404&view=rev
Author:   wjpalenstijn
Date:     2010-10-13 10:50:45 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
CONFIGURE: Don't execute a binary just to check libpng version

This fixes detection of libpng when cross-compiling.

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-10-13 10:41:30 UTC (rev 53403)
+++ scummvm/trunk/configure	2010-10-13 10:50:45 UTC (rev 53404)
@@ -2372,10 +2372,15 @@
 	_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"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.