Implement SoX native format muxer and demuxer.

[ffmpeg] / configure

diff --git a/configure b/configure
index 57c64f59841b6a5ce428bd9440d094614cbb2ebc..c35bfbb9b52161d6ecfd516ea620d9fef6172bdf 100755 (executable)
--- a/configure
+++ b/configure
@@ -830,8 +830,10 @@ ARCH_LIST='
     ia64
     m68k
     mips
+    mips64
     parisc
     ppc
+    ppc64
     s390
     sh4
     sparc
@@ -866,6 +868,7 @@ HAVE_LIST="
     alsa_asoundlib_h
     altivec_h
     arpa_inet_h
+    bigendian
     bswap
     closesocket
     cmov
@@ -894,6 +897,7 @@ HAVE_LIST="
     libdc1394_1
     libdc1394_2
     llrint
+    loongson
     lrint
     lrintf
     lzo1x_999_compress
@@ -904,7 +908,6 @@ HAVE_LIST="
     mkstemp
     pld
     posix_memalign
-    ppc64
     round
     roundf
     sdl
@@ -1001,7 +1004,6 @@ vis_deps="sparc"
 
 # decoders / encoders / hardware accelerators
 aac_decoder_select="fft mdct"
-ac3_decoder_deps="gpl"
 ac3_decoder_select="fft mdct"
 atrac3_decoder_select="fft mdct"
 cavs_decoder_select="golomb"
@@ -1010,7 +1012,6 @@ cscd_decoder_suggest="zlib"
 dca_decoder_select="fft mdct"
 dnxhd_encoder_select="aandct"
 dxa_decoder_select="zlib"
-eac3_decoder_deps="gpl"
 eac3_decoder_select="fft mdct"
 eatgq_decoder_select="aandct"
 eatqi_decoder_select="aandct"
@@ -1498,6 +1499,7 @@ case "$arch" in
     ;;
     mips64)
         arch="mips"
+        subarch="mips64"
         enable fast_64bit
     ;;
     parisc|hppa)
@@ -1513,6 +1515,7 @@ case "$arch" in
     ;;
     ppc64)
         arch="ppc"
+        subarch="ppc64"
         enable fast_64bit
         enable fast_unaligned
     ;;
@@ -1694,6 +1697,10 @@ case $target_os in
         SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.a "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.lib'
         enable dos_paths
         ;;
+    gnu/kfreebsd)
+        ;;
+    gnu)
+        ;;
 
     *)
         die "Unknown OS '$target_os'."
@@ -1737,7 +1744,7 @@ fi
 
 
 die_license_disabled() {
-    enabled $1 || enabled $2 && die "$2 is $1 and --enable-$1 is not specified."
+    enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; }
 }
 
 die_license_disabled gpl libfaad2
@@ -1748,6 +1755,7 @@ die_license_disabled gpl x11grab
 
 die_license_disabled nonfree libamr_nb
 die_license_disabled nonfree libamr_wb
+die_license_disabled nonfree libfaac
 
 
 check_deps $ARCH_EXT_LIST
@@ -1801,12 +1809,11 @@ if test $cpu != "generic"; then
         G5|g5|970|ppc970|PowerPC970|power4*|Power4*)
             add_cflags -mcpu=970 -mpowerpc-gfxopt -mpowerpc64
             warn_altivec disabled PPC970
-            enable ppc64
         ;;
         Cell|CELL|cell)
             add_cflags -mcpu=cell
             warn_altivec disabled Cell
-            enable ppc64 ldbrx
+            enable ldbrx
         ;;
         # targets that do NOT support conditional mov (cmov)
         i[345]86|pentium|pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3)
@@ -1844,6 +1851,9 @@ if test $cpu != "generic"; then
         bf*)
             add_cflags -mcpu=$cpu
         ;;
+        mips*|[45]k*|[237]4k*|m4k|r*000|loongson2[ef])
+            add_cflags -march=$cpu
+        ;;
         *)
             echo "WARNING: Unknown CPU \"$cpu\", ignored."
         ;;
@@ -1907,6 +1917,8 @@ fi
 
 # check for assembler specific support
 
+enabled mips && check_asm loongson '"dmult.g $1, $2, $3"'
+
 enabled ppc && check_asm dcbzl '"dcbzl 0, 1"'
 enabled ppc && check_asm ppc4xx '"maclhw r10, r11, r12"'
 enabled ppc && check_asm xform_asm '"lwzx 0, %y0" :: "Z"(*(int*)0)'
@@ -2376,11 +2388,11 @@ for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf ind
     echo
 done
 
-license="LGPL"
+license="LGPL version 2.1 or later"
 if enabled nonfree; then
-    license="unredistributable"
+    license="nonfree and unredistributable"
 elif enabled gpl; then
-    license="GPL"
+    license="GPL version 2 or later"
 fi
 
 echo "License: $license"