 Index: configure
 ===================================================================
---- configure	(rvision 547)
-+++ configure	(copie de travail)
-@@ -66,48 +66,147 @@
+--- configure	(revision 560)
++++ configure	(working copy)
+@@ -66,8 +66,109 @@
  
  EXE=""
  
--UNAMES="`uname -s`"
 +AR="ar"
 +AROPTS="rc"
 +RANLIB="ranlib"
 +
-+UNAMES="`uname -s |tr A-Z a-z`"
-+UNAMEM="`uname -m |tr A-Z a-z`"
-+
+ MACHINE="$(./config.guess)"
+ 
 +# parse options
 +
 +for opt do
 +    optarg="${opt#*=}"
 +    case "$opt" in
-+       --crosscompile=*)
-+           CROSS="$optarg"
-+           CC="$CROSS-gcc"
-+           AR="$CROSS-ar"
-+           RANLIB="$CROSS-ranlib"
-+           UNAMES="`echo $CROSS | cut -d- -f2`"
-+           UNAMEM="`echo $CROSS | cut -d- -f1`"
-+           ;;
-+       --prefix=*)
-+           prefix="$optarg"
-+           ;;
-+       --exec-prefix=*)
-+           eprefix="$optarg"
-+           ;;
-+       --bindir=*)
-+           bindir="$optarg"
-+           ;;
-+       --libdir=*)
-+           libdir="$optarg"
-+           ;;
-+       --includedir=*)
-+           includedir="$optarg"
-+           ;;
++	--crosscompile=*)
++            CROSS="$optarg"
++            CC="$CROSS-gcc"
++            AR="$CROSS-ar"
++            RANLIB="$CROSS-ranlib"
++            MACHINE="`echo $CROSS | sed -e 's/-/-x-/g'`"
++	    ;;
++        --prefix=*)
++            prefix="$optarg"
++            ;;
++        --exec-prefix=*)
++            exec_prefix="$optarg"
++            ;;
++        --bindir=*)
++            bindir="$optarg"
++            ;;
++        --libdir=*)
++            libdir="$optarg"
++            ;;
++        --includedir=*)
++            includedir="$optarg"
++            ;;
 +        --enable-avis-input)
-+            if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
-+                CFLAGS="$CFLAGS -DAVIS_INPUT"
-+                LDFLAGS="$LDFLAGS -lvfw32"
-+                avis_input="yes"
-+            fi
++            avis_input="yes"
++            ;;
++        --disable-avis-input)
++            avis_input="no"
 +            ;;
 +        --enable-mp4-output)
-+            CFLAGS="$CFLAGS -DMP4_OUTPUT"
-+            LDFLAGS="$LDFLAGS -lgpac_static"
-+            if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
-+                LDFLAGS="$LDFLAGS -lwinmm"
-+            fi
 +            mp4_output="yes"
++            ;;
++        --disable-mp4-output)
++            mp4_output="no"
 +            ;;
 +        --extra-asflags=*)
 +            ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"

 # autodetect options that weren't forced nor disabled
 
 if test "$pthread" = "auto" ; then
@@ -365,6 +374,9 @@
 VFW=$vfw
 GTK=$gtk
 EXE=$EXE
+AR=$AR
+AROPTS=$AROPTS
+RANLIB=$RANLIB
 VIS=$vis
 HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
 DEVNULL=$DEVNULL
Index: Makefile
===================================================================
--- Makefile	(rvision 547)
+++ Makefile	(copie de travail)
@@ -64,8 +64,8 @@
 default: $(DEP) x264$(EXE)
 

-            pthread="no"
-            ;;
-        --enable-debug)
-            debug="yes"
-            ;;
-        --enable-gprof)
