Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 17:02:37 +0000 (18:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 17:02:37 +0000 (18:02 +0100)
* qatar/master:
  configure: List external libs used using print_enabled()

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -4302,53 -3837,6 +4302,10 @@@ echo "network support           ${netwo
  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}"
 +echo "makeinfo enabled          ${makeinfo-no}"
  test -n "$random_seed" &&
      echo "random seed               ${random_seed}"
  echo