diff -purN mplayer-export-2009-12-26.orig/configure mplayer-export-2009-12-26/configure --- mplayer-export-2009-12-26.orig/configure 2010-02-18 16:57:49.000000000 +0100 +++ mplayer-export-2009-12-26/configure 2010-02-19 09:10:08.000000000 +0100 @@ -2437,6 +2437,9 @@ fi # if darwin && test "$cc_vendor" = "g # Checking for CFLAGS _install_strip="-s" +if test "$_cross_compile" == "yes" ; then + _install_strip="" +else if test "$_profile" != "" || test "$_debug" != "" ; then CFLAGS="-W -Wall -O2 $_march $_mcpu $_pipe $_debug $_profile" _install_strip= @@ -2452,6 +2455,7 @@ elif test -z "$CFLAGS" ; then else _warn_CFLAGS=yes fi +fi cat > $TMPC << EOF int main(void) { return 0; } @@ -5197,6 +5201,7 @@ EOF fi fi fi + if test "$_sdl" = yes ; then def_sdl='#define CONFIG_SDL 1' if cygwin ; then @@ -5213,9 +5218,18 @@ if test "$_sdl" = yes ; then _aomodules="sdl $_aomodules" _res_comment="using $_sdlconfig" else - def_sdl='#undef CONFIG_SDL' - _novomodules="sdl $_novomodules" - _noaomodules="sdl $_noaomodules" + if test "$_cross_compile" = "yes" ; then + if test "x$SDL_LIBS" != "x" && test "x$SDL_CFLAGS" != "x" ; then + def_sdl='#define CONFIG_SDL 1' + libs_mplayer="$libs_mplayer $SDL_LIBS" + extra_cflags="$extra_cflags $(echo $SDL_CFLAGS | sed s/-D_GNU_SOURCE=1//)" + _sdl="yes" + fi + else + def_sdl='#undef CONFIG_SDL' + _novomodules="sdl $_novomodules" + _noaomodules="sdl $_noaomodules" + fi fi echores "$_sdl" @@ -6104,8 +6118,8 @@ EOF fi if test "$_freetype" = yes ; then def_freetype='#define CONFIG_FREETYPE 1' - extra_cflags="$extra_cflags $($_freetypeconfig --cflags)" - extra_ldflags="$extra_ldflags $($_freetypeconfig --libs)" + extra_cflags="$extra_cflags $FREETYPE_CFLAGS" + extra_ldflags="$extra_ldflags $FREETYPE_LIBS" else def_freetype='#undef CONFIG_FREETYPE' fi @@ -6144,6 +6158,8 @@ EOF fi if test "$_fontconfig" = yes ; then def_fontconfig='#define CONFIG_FONTCONFIG 1' + extra_ldflags="$extra_ldflags $FONTCONFIG_LIBS" + extra_cflags="$extra_cflags $FONTCONFIG_CFLAGS" else def_fontconfig='#undef CONFIG_FONTCONFIG' fi