From 3ae81e84beba561133d1b4881c7a6584102b6687 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 30 May 2010 12:14:40 +0000 Subject: 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 --- configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 6c65a819b7..e949f82e1d 100755 --- a/configure +++ b/configure @@ -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" -- cgit v1.2.3