comparison configure @ 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 7c2a244950ba
children e02877d8647e
comparison
equal deleted inserted replaced
31215:d0f70692a140 31216:207ecac1f8e1
57 _configuration="$*" 57 _configuration="$*"
58 58
59 # Prefer these macros to full length text ! 59 # Prefer these macros to full length text !
60 # These macros only return an error code - NO display is done 60 # These macros only return an error code - NO display is done
61 compile_check() { 61 compile_check() {
62 source="$1"
63 shift
62 echo >> "$TMPLOG" 64 echo >> "$TMPLOG"
63 cat "$1" >> "$TMPLOG" 65 cat "$source" >> "$TMPLOG"
64 echo >> "$TMPLOG" 66 echo >> "$TMPLOG"
65 echo "$_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG" 67 echo "$_cc $source $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
66 rm -f "$TMPEXE" 68 rm -f "$TMPEXE"
67 $_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1 69 $_cc $CFLAGS "$source" $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
68 TMPRES="$?" 70 TMPRES="$?"
69 echo >> "$TMPLOG" 71 echo >> "$TMPLOG"
70 echo >> "$TMPLOG" 72 echo >> "$TMPLOG"
71 return "$TMPRES" 73 return "$TMPRES"
72 } 74 }