diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-05-30 12:14:40 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-05-30 12:14:40 +0000 |
| commit | 3ae81e84beba561133d1b4881c7a6584102b6687 (patch) | |
| tree | 2bd76a70e460d507c25f7bb06c43ab27795e973d /configure | |
| parent | 8830acfc7388d7952e9fab71552993d7f35dfe52 (diff) | |
| download | mpv-3ae81e84beba561133d1b4881c7a6584102b6687.tar.bz2 mpv-3ae81e84beba561133d1b4881c7a6584102b6687.tar.xz | |
Change compiler argument order for compile_check to avoid incorrect linking
errors during detection with static libraries (in particular OpenGL + static SDL).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31282 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -59,12 +59,14 @@ _configuration="$*" # Prefer these macros to full length text ! # These macros only return an error code - NO display is done compile_check() { + source="$1" + shift echo >> "$TMPLOG" - cat "$1" >> "$TMPLOG" + cat "$source" >> "$TMPLOG" echo >> "$TMPLOG" - echo "$_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG" + echo "$_cc $source $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG" rm -f "$TMPEXE" - $_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1 + $_cc $CFLAGS "$source" $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1 TMPRES="$?" echo >> "$TMPLOG" echo >> "$TMPLOG" |