[Ffmpeg-cvslog] r5818 - trunk/configure

diego subversion
Mon Jul 24 02:58:20 CEST 2006


Author: diego
Date: Mon Jul 24 02:58:20 2006
New Revision: 5818

Modified:
   trunk/configure

Log:
Fix --extra-ldflags when cross-compiling for MinGW.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Jul 24 02:58:20 2006
@@ -709,7 +709,7 @@
   ;;
   --extra-cflags=*) CFLAGS="$CFLAGS $optval"
   ;;
-  --extra-ldflags=*) FFLDFLAGS="$FFLDFLAGS $optval"
+  --extra-ldflags=*) EXTRALDFLAGS="$optval"
   ;;
   --extra-libs=*) extralibs="$optval"
   ;;
@@ -893,7 +893,6 @@
     if test "$mingwce" = "yes"; then
         protocols="no"
     fi
-    #FIXME: This ignores --extra-ldflags.
     FFLDFLAGS='-Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)'
     SLIBPREF=""
     SLIBSUF=".dll"
@@ -902,8 +901,8 @@
     if test "$force_libdir" != yes; then bindir="$PREFIX"; fi
 fi
 
-# Combine FFLDFLAGS and the LDFLAGS environment variable
-LDFLAGS="$FFLDFLAGS $LDFLAGS"
+# Combine FFLDFLAGS, EXTRALDFLAGS and the LDFLAGS environment variable.
+LDFLAGS="$FFLDFLAGS $EXTRALDFLAGS $LDFLAGS"
 
 test -n "$cross_prefix" && cross_compile=yes
 cc="${cross_prefix}${cc}"




More information about the ffmpeg-cvslog mailing list