Mercurial > mplayer.hg
changeset 31216:207ecac1f8e1
Change compiler argument order for compile_check to avoid incorrect linking
errors during detection with static libraries (in particular OpenGL + static SDL).
| author | reimar |
|---|---|
| date | Sun, 30 May 2010 12:14:40 +0000 |
| parents | d0f70692a140 |
| children | c9a36e78e221 |
| files | configure |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun May 30 10:01:40 2010 +0000 +++ b/configure Sun May 30 12:14:40 2010 +0000 @@ -59,12 +59,14 @@ # Prefer these macros to full length text ! # These macros only return an error code - NO display is done compile_check() { - echo >> "$TMPLOG" - cat "$1" >> "$TMPLOG" + source="$1" + shift echo >> "$TMPLOG" - echo "$_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG" + cat "$source" >> "$TMPLOG" + echo >> "$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"