fix adpcm swf decoding

[ffmpeg] / configure

diff --git a/configure b/configure
index 2531c2bf97fd2c99526a191352690e1084dcce34..fd565dcc07f1a1af587bc9698d0b4eef7287e0a9 100755 (executable)
--- a/configure
+++ b/configure
@@ -577,12 +577,19 @@ CONFIG_LIST='
     zlib
 '
 
-HAVE_LIST='
+THREADS_LIST='
+    beosthreads
+    os2threads
+    pthreads
+    w32threads
+'
+
+HAVE_LIST="
+    $THREADS_LIST
     altivec
     altivec_h
     armv5te
     armv6
-    beosthreads
     byteswap_h
     cmov
     dcbzl
@@ -593,6 +600,7 @@ HAVE_LIST='
     dev_video_bktr_ioctl_bt848_h
     dlfcn_h
     dlopen
+    fast_64bit
     fast_cmov
     freetype2
     imlib2
@@ -608,16 +616,13 @@ HAVE_LIST='
     mmi
     mmx
     os2
-    os2threads
-    pthreads
     sdl
     sdl_video_size
     soundcard_h
     sys_poll_h
     sys_soundcard_h
     threads
-    w32threads
-'
+"
 
 TARGET_LIST='
     altivec
@@ -631,15 +636,12 @@ TARGET_LIST='
 CMDLINE_SELECT="
     $CONFIG_LIST
     $TARGET_LIST
+    $THREADS_LIST
     amr_if2
     debug
     extra_warnings
     shared
     static
-    beosthreads
-    os2threads
-    pthreads
-    w32threads
 "
 
 flashsv_decoder_deps="zlib"
@@ -746,7 +748,6 @@ bigendian="no"
 # OS
 targetos=`uname -s`
 beos_netserver="no"
-mingw32="no"
 os2="no"
 wince="no"
 
@@ -957,6 +958,7 @@ case "$arch" in
     if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
       if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
         arch="x86_64"
+        enable fast_64bit
       fi
     fi
   ;;
@@ -966,15 +968,21 @@ case "$arch" in
   ;;
   alpha)
     arch="alpha"
+    enable fast_64bit
   ;;
-  "Power Macintosh"|ppc|ppc64|powerpc)
+  "Power Macintosh"|ppc|powerpc)
     arch="powerpc"
   ;;
+  ppc64)
+    arch="powerpc"
+    enable fast_64bit
+  ;;
   mips|mipsel|IP*)
     arch="mips"
   ;;
   sun4u|sparc64)
     arch="sparc64"
+    enable fast_64bit
   ;;
   sparc)
     arch="sparc"
@@ -982,9 +990,13 @@ case "$arch" in
   sh4)
     arch="sh4"
   ;;
-  parisc|parisc64)
+  parisc)
     arch="parisc"
   ;;
+  parisc64)
+    arch="parisc"
+    enable fast_64bit
+  ;;
   s390|s390x)
     arch="s390"
   ;;
@@ -993,6 +1005,7 @@ case "$arch" in
   ;;
   ia64)
     arch="ia64"
+    enable fast_64bit
   ;;
   bfin)
     arch="bfin"
@@ -1085,7 +1098,6 @@ case `tolower $targetos` in
     FFSERVERLDFLAGS=-Wl,-bind_at_load
     ;;
   mingw32*)
-    mingw32="yes"
     if enabled_all shared static; then
         cat <<EOF
 You can only build one library type at once on MinGW.
@@ -1330,6 +1342,10 @@ if test $cpu != "generic"; then
         sparc64)
             add_cflags "-mcpu=v9"
         ;;
+        bf*) #bf531 bf532 bf533 bf561 bf5xx all get this config
+            add_cflags "-mfdpic"
+            add_ldflags "-mfdpic -Wl,--defsym,__stacksize=0x40000"
+        ;;
         *)
         echo "WARNING: Unknown CPU \"$cpu\", ignored."
         ;;
@@ -1519,7 +1535,7 @@ if enabled pthreads; then
     fi
 fi
 
-for thread in pthreads beosthreads os2threads w32threads; do
+for thread in $THREADS_LIST; do
     if enabled $thread; then
         if ! disabled thread_type ; then
             die "ERROR: Only one thread type must be selected."
@@ -1576,7 +1592,7 @@ fi
 
 test "$vhook" = "default" && vhook="$dlopen"
 
-enabled_any vhook liba52bin libfaadbin && add_extralibs $ldl
+enabled_any vhook liba52bin libfaadbin ffserver && add_extralibs $ldl
 
 if test "$targetos" = "CYGWIN" && enabled static ; then
     vhook="no"
@@ -1731,7 +1747,7 @@ enabled_any $DECODER_LIST && enable decoders
 enabled_any $MUXER_LIST   && enable muxers
 enabled_any $DEMUXER_LIST && enable demuxers
 
-enabled_any pthreads beosthreads os2threads w32threads && enable threads
+enabled_any $THREADS_LIST && enable threads
 
 check_deps $CONFIG_LIST $HAVE_LIST $DECODER_LIST $ENCODER_LIST $PARSER_LIST \
     $DEMUXER_LIST $MUXER_LIST