[MPlayer-cvslog] r31282 - trunk/configure

reimar subversion at mplayerhq.hu
Sun May 30 14:14:40 CEST 2010


Author: reimar
Date: Sun May 30 14:14:40 2010
New Revision: 31282

Log:
Change compiler argument order for compile_check to avoid incorrect linking
errors during detection with static libraries (in particular OpenGL + static SDL).

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun May 30 12:01:40 2010	(r31281)
+++ trunk/configure	Sun May 30 14:14:40 2010	(r31282)
@@ -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"


More information about the MPlayer-cvslog mailing list