Merge remote-tracking branch 'qatar/master'

[ffmpeg] / configure

diff --git a/configure b/configure
index 4c5f4b3e153943f334512851d20a998bf9a7a1b4..f44271511b724bd508153f0d864f135ccad5ecd2 100755 (executable)
--- a/configure
+++ b/configure
@@ -130,7 +130,6 @@ Component options:
   --disable-pthreads       disable pthreads [auto]
   --disable-w32threads     disable Win32 threads [auto]
   --disable-os2threads     disable OS/2 threads [auto]
-  --enable-x11grab         enable X11 grabbing [no]
   --disable-network        disable network support [no]
   --disable-dct            disable DCT code
   --disable-dwt            disable DWT code
@@ -234,6 +233,7 @@ External library support:
                            native MPEG-4/Xvid encoder exists [no]
   --enable-openal          enable OpenAL 1.1 capture support [no]
   --enable-openssl         enable openssl [no]
+  --enable-x11grab         enable X11 grabbing [no]
   --enable-zlib            enable zlib [autodetect]
 
 Advanced options (experts only):
@@ -1115,6 +1115,58 @@ COMPONENT_LIST="
     protocols
 "
 
+EXTERNAL_LIBRARY_LIST="
+    avisynth
+    bzlib
+    crystalhd
+    fontconfig
+    frei0r
+    gnutls
+    libaacplus
+    libass
+    libbluray
+    libcaca
+    libcdio
+    libcelt
+    libdc1394
+    libfaac
+    libfdk_aac
+    libflite
+    libfreetype
+    libgsm
+    libiec61883
+    libilbc
+    libmodplug
+    libmp3lame
+    libnut
+    libopencore_amrnb
+    libopencore_amrwb
+    libopencv
+    libopenjpeg
+    libopus
+    libpulse
+    librtmp
+    libschroedinger
+    libsoxr
+    libspeex
+    libstagefright_h264
+    libtheora
+    libtwolame
+    libutvideo
+    libv4l2
+    libvo_aacenc
+    libvo_amrwbenc
+    libvorbis
+    libvpx
+    libx264
+    libxavs
+    libxvid
+    openal
+    openssl
+    x11grab
+    zlib
+"
+
 DOCUMENT_LIST="
     doc
     htmlpages
@@ -1152,63 +1204,19 @@ PROGRAM_LIST="
 CONFIG_LIST="
     $COMPONENT_LIST
     $DOCUMENT_LIST
+    $EXTERNAL_LIBRARY_LIST
     $HWACCEL_LIST
     $LIBRARY_LIST
     $PROGRAM_LIST
-    avisynth
-    bzlib
-    crystalhd
     dct
     dwt
     fast_unaligned
     fft
-    fontconfig
-    frei0r
     ftrapv
-    gnutls
     gpl
     gray
     hardcoded_tables
     incompatible_fork_abi
-    libaacplus
-    libass
-    libbluray
-    libcaca
-    libcdio
-    libcelt
-    libdc1394
-    libfaac
-    libfdk_aac
-    libflite
-    libfreetype
-    libgsm
-    libiec61883
-    libilbc
-    libmodplug
-    libmp3lame
-    libnut
-    libopencore_amrnb
-    libopencore_amrwb
-    libopencv
-    libopenjpeg
-    libopus
-    libpulse
-    librtmp
-    libschroedinger
-    libsoxr
-    libspeex
-    libstagefright_h264
-    libtheora
-    libtwolame
-    libutvideo
-    libv4l2
-    libvo_aacenc
-    libvo_amrwbenc
-    libvorbis
-    libvpx
-    libx264
-    libxavs
-    libxvid
     lsp
     lzo
     mdct
@@ -1216,8 +1224,6 @@ CONFIG_LIST="
     memory_poisoning
     network
     nonfree
-    openal
-    openssl
     pic
     rdft
     runtime_cpudetect
@@ -1230,8 +1236,6 @@ CONFIG_LIST="
     thumb
     version3
     xmm_clobber_test
-    x11grab
-    zlib
 "
 
 THREADS_LIST='
@@ -2116,7 +2120,7 @@ cxx_default="g++"
 host_cc_default="gcc"
 cp_f="cp -f"
 install="install"
-ln_s="ln -sf"
+ln_s="ln -s -f"
 nm_default="nm -g"
 objformat="elf"
 pkg_config_default=pkg-config
@@ -2632,7 +2636,7 @@ probe_cc(){
         fi
         _cflags_speed='-O3'
         _cflags_size='-Os'
-    elif $_cc --version 2>/dev/null | grep -q Intel; then
+    elif $_cc --version 2>/dev/null | grep -q ^icc; then
         _type=icc
         _ident=$($_cc --version | head -n1)
         _depflags='-MMD'
@@ -3387,7 +3391,6 @@ case $target_os in
         network_extralibs='-lbsd'
         exeobjs=compat/plan9/main.o
         disable ffserver
-        ln_s='ln -s -f'
         cp_f='cp'
         ;;
     none)
@@ -4134,8 +4137,6 @@ if enabled icc; then
     # 11030: Warning unknown option --as-needed
     # 10156: ignoring option '-export'; no argument required
     check_ldflags -wd10156,11030
-    # Allow to compile with optimizations
-    check_ldflags -march=$cpu
     # icc 11.0 and 11.1 work with ebp_available, but don't pass the test
     enable ebp_available
     if enabled x86_32; then
@@ -4298,49 +4299,6 @@ echo "network support           ${network-no}"
 echo "threading support         ${thread_type-no}"
 echo "safe bitstream reader     ${safe_bitstream_reader-no}"
 echo "SDL support               ${sdl-no}"
-echo "AVISynth enabled          ${avisynth-no}"
-echo "frei0r enabled            ${frei0r-no}"
-echo "gnutls enabled            ${gnutls-no}"
-echo "libaacplus enabled        ${libaacplus-no}"
-echo "libass enabled            ${libass-no}"
-echo "libcaca enabled           ${libcaca-no}"
-echo "libcdio support           ${libcdio-no}"
-echo "libcelt enabled           ${libcelt-no}"
-echo "libdc1394 support         ${libdc1394-no}"
-echo "libfaac enabled           ${libfaac-no}"
-echo "libfdk-aac enabled        ${libfdk_aac-no}"
-echo "libgsm enabled            ${libgsm-no}"
-echo "libiec61883 support       ${libiec61883-no}"
-echo "libilbc enabled           ${libilbc-no}"
-echo "libmodplug enabled        ${libmodplug-no}"
-echo "libmp3lame enabled        ${libmp3lame-no}"
-echo "libnut enabled            ${libnut-no}"
-echo "libopencore-amrnb support ${libopencore_amrnb-no}"
-echo "libopencore-amrwb support ${libopencore_amrwb-no}"
-echo "libopencv support         ${libopencv-no}"
-echo "libopenjpeg enabled       ${libopenjpeg-no}"
-echo "libopus enabled           ${libopus-no}"
-echo "libpulse enabled          ${libpulse-no}"
-echo "librtmp enabled           ${librtmp-no}"
-echo "libschroedinger enabled   ${libschroedinger-no}"
-echo "libsoxr enabled           ${libsoxr-no}"
-echo "libspeex enabled          ${libspeex-no}"
-echo "libstagefright-h264 enabled    ${libstagefright_h264-no}"
-echo "libtheora enabled         ${libtheora-no}"
-echo "libtwolame enabled        ${libtwolame-no}"
-echo "libutvideo enabled        ${libutvideo-no}"
-echo "libv4l2 enabled           ${libv4l2-no}"
-echo "libvo-aacenc support      ${libvo_aacenc-no}"
-echo "libvo-amrwbenc support    ${libvo_amrwbenc-no}"
-echo "libvorbis enabled         ${libvorbis-no}"
-echo "libvpx enabled            ${libvpx-no}"
-echo "libx264 enabled           ${libx264-no}"
-echo "libxavs enabled           ${libxavs-no}"
-echo "libxvid enabled           ${libxvid-no}"
-echo "openal enabled            ${openal-no}"
-echo "openssl enabled           ${openssl-no}"
-echo "zlib enabled              ${zlib-no}"
-echo "bzlib enabled             ${bzlib-no}"
 echo "texi2html enabled         ${texi2html-no}"
 echo "perl enabled              ${perl-no}"
 echo "pod2man enabled           ${pod2man-no}"
@@ -4349,6 +4307,10 @@ test -n "$random_seed" &&
     echo "random seed               ${random_seed}"
 echo
 
+echo "External libraries:"
+print_enabled '' $EXTERNAL_LIBRARY_LIST | print_3_columns
+echo
+
 for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do
     echo "Enabled ${type}s:"
     eval list=\$$(toupper $type)_LIST