Commit | Line | Data |
---|---|---|
7b12e9cd JB |
1 | diff -purN mplayer-export-2009-12-26.orig/configure mplayer-export-2009-12-26/configure |
2 | --- mplayer-export-2009-12-26.orig/configure 2010-02-18 16:57:49.000000000 +0100 | |
3 | +++ mplayer-export-2009-12-26/configure 2010-02-19 09:10:08.000000000 +0100 | |
4 | @@ -2437,6 +2437,9 @@ fi # if darwin && test "$cc_vendor" = "g | |
5 | ||
6 | # Checking for CFLAGS | |
7 | _install_strip="-s" | |
8 | +if test "$_cross_compile" == "yes" ; then | |
9 | + _install_strip="" | |
10 | +else | |
11 | if test "$_profile" != "" || test "$_debug" != "" ; then | |
12 | CFLAGS="-W -Wall -O2 $_march $_mcpu $_pipe $_debug $_profile" | |
13 | _install_strip= | |
14 | @@ -2452,6 +2455,7 @@ elif test -z "$CFLAGS" ; then | |
15 | else | |
16 | _warn_CFLAGS=yes | |
17 | fi | |
18 | +fi | |
19 | ||
20 | cat > $TMPC << EOF | |
21 | int main(void) { return 0; } | |
22 | @@ -5197,6 +5201,7 @@ EOF | |
23 | fi | |
24 | fi | |
25 | fi | |
26 | + | |
27 | if test "$_sdl" = yes ; then | |
28 | def_sdl='#define CONFIG_SDL 1' | |
29 | if cygwin ; then | |
30 | @@ -5213,9 +5218,18 @@ if test "$_sdl" = yes ; then | |
31 | _aomodules="sdl $_aomodules" | |
32 | _res_comment="using $_sdlconfig" | |
33 | else | |
34 | - def_sdl='#undef CONFIG_SDL' | |
35 | - _novomodules="sdl $_novomodules" | |
36 | - _noaomodules="sdl $_noaomodules" | |
37 | + if test "$_cross_compile" = "yes" ; then | |
38 | + if test "x$SDL_LIBS" != "x" && test "x$SDL_CFLAGS" != "x" ; then | |
39 | + def_sdl='#define CONFIG_SDL 1' | |
40 | + libs_mplayer="$libs_mplayer $SDL_LIBS" | |
41 | + extra_cflags="$extra_cflags $(echo $SDL_CFLAGS | sed s/-D_GNU_SOURCE=1//)" | |
42 | + _sdl="yes" | |
43 | + fi | |
44 | + else | |
45 | + def_sdl='#undef CONFIG_SDL' | |
46 | + _novomodules="sdl $_novomodules" | |
47 | + _noaomodules="sdl $_noaomodules" | |
48 | + fi | |
49 | fi | |
50 | echores "$_sdl" | |
51 | ||
52 | @@ -6104,8 +6118,8 @@ EOF | |
53 | fi | |
54 | if test "$_freetype" = yes ; then | |
55 | def_freetype='#define CONFIG_FREETYPE 1' | |
56 | - extra_cflags="$extra_cflags $($_freetypeconfig --cflags)" | |
57 | - extra_ldflags="$extra_ldflags $($_freetypeconfig --libs)" | |
58 | + extra_cflags="$extra_cflags $FREETYPE_CFLAGS" | |
59 | + extra_ldflags="$extra_ldflags $FREETYPE_LIBS" | |
60 | else | |
61 | def_freetype='#undef CONFIG_FREETYPE' | |
62 | fi | |
63 | @@ -6144,6 +6158,8 @@ EOF | |
64 | fi | |
65 | if test "$_fontconfig" = yes ; then | |
66 | def_fontconfig='#define CONFIG_FONTCONFIG 1' | |
67 | + extra_ldflags="$extra_ldflags $FONTCONFIG_LIBS" | |
68 | + extra_cflags="$extra_cflags $FONTCONFIG_CFLAGS" | |
69 | else | |
70 | def_fontconfig='#undef CONFIG_FONTCONFIG' | |
71 | fi |