[Scummvm-cvs-logs] CVS: scummvm configure,1.138,1.139

Pawel Kolodziejski aquadran at users.sourceforge.net
Tue Jan 24 11:25:04 CET 2006


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6287

Modified Files:
	configure 
Log Message:
don't execute binary for libmpeg2 test when cross compiling

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- configure	21 Jan 2006 18:22:01 -0000	1.138
+++ configure	24 Jan 2006 19:24:22 -0000	1.139
@@ -1123,7 +1123,13 @@
 	return 1;
 }
 EOF
-	cc_check $LDFLAGS $CXXFLAGS $MPEG2_CFLAGS $MPEG2_LIBS -lmpeg2 && $TMPO && _mpeg2=yes
+
+	if test -n "$_host"; then
+		# don't execute while cross compiling
+		cc_check $LDFLAGS $CXXFLAGS $MPEG2_CFLAGS $MPEG2_LIBS -lmpeg2 && _mpeg2=yes
+	else
+		cc_check $LDFLAGS $CXXFLAGS $MPEG2_CFLAGS $MPEG2_LIBS -lmpeg2 && $TMPO && _mpeg2=yes
+	fi
 fi
 if test "$_mpeg2" = yes ; then
 	_def_mpeg2='#define USE_MPEG2'





More information about the Scummvm-git-logs mailing list