indent

[frescor/ffmpeg.git] / configure

diff --git a/configure b/configure
index a5f608a5ffba016c730c6f2700db8fece07ccf02..7ee8553bace541b05dcfb57c7b98f8f6dc506d01 100755 (executable)
--- a/configure
+++ b/configure
@@ -830,6 +830,7 @@ ARCH_LIST='
     ia64
     m68k
     mips
+    mips64
     parisc
     ppc
     s390
@@ -866,6 +867,7 @@ HAVE_LIST="
     alsa_asoundlib_h
     altivec_h
     arpa_inet_h
+    bigendian
     bswap
     closesocket
     cmov
@@ -890,6 +892,7 @@ HAVE_LIST="
     getrusage
     inet_aton
     inline_asm
+    ldbrx
     libdc1394_1
     libdc1394_2
     llrint
@@ -923,6 +926,7 @@ HAVE_LIST="
     truncf
     VirtualAlloc
     winsock2_h
+    xform_asm
     yasm
 "
 
@@ -999,7 +1003,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"
@@ -1008,7 +1011,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"
@@ -1496,6 +1498,7 @@ case "$arch" in
     ;;
     mips64)
         arch="mips"
+        subarch="mips64"
         enable fast_64bit
     ;;
     parisc|hppa)
@@ -1692,6 +1695,8 @@ 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)
+        ;;
 
     *)
         die "Unknown OS '$target_os'."
@@ -1734,22 +1739,20 @@ EOF
 fi
 
 
-if ! enabled gpl; then
-    die_gpl_disabled(){
-        name=$1
-        shift
-        enabled_any $@ && die "$name is under GPL and --enable-gpl is not specified."
-    }
-    die_gpl_disabled "The Postprocessing code" postproc
-    die_gpl_disabled "libx264"                 libx264
-    die_gpl_disabled "libxvidcore"             libxvid
-    die_gpl_disabled "FAAD2"                   libfaad2
-    die_gpl_disabled "The X11 grabber"         x11grab
-fi
+die_license_disabled() {
+    enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; }
+}
+
+die_license_disabled gpl libfaad2
+die_license_disabled gpl libx264
+die_license_disabled gpl libxvid
+die_license_disabled gpl postproc
+die_license_disabled gpl x11grab
+
+die_license_disabled nonfree libamr_nb
+die_license_disabled nonfree libamr_wb
+die_license_disabled nonfree libfaac
 
-if ! enabled nonfree && enabled_any libamr_nb libamr_wb; then
-    die "libamr is nonfree and --enable-nonfree is not specified."
-fi
 
 check_deps $ARCH_EXT_LIST
 
@@ -1807,7 +1810,7 @@ if test $cpu != "generic"; then
         Cell|CELL|cell)
             add_cflags -mcpu=cell
             warn_altivec disabled Cell
-            enable ppc64
+            enable ppc64 ldbrx
         ;;
         # targets that do NOT support conditional mov (cmov)
         i[345]86|pentium|pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3)
@@ -1842,6 +1845,12 @@ if test $cpu != "generic"; then
         ev4|ev45|ev5|ev56|pca56|ev6|ev67)
             enabled ccc && add_cflags -arch $cpu || add_cflags -mcpu=$cpu
         ;;
+        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 +1916,7 @@ fi
 
 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)'
 
 # check for SIMD availability
 
@@ -2373,11 +2383,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"