Merge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 16:55:31 +0000 (17:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 16:55:31 +0000 (17:55 +0100)
* commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768':
  configure: Move list of external libs to a separate variable

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1115,14 -1011,41 +1115,66 @@@ 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
 +    manpages
 +    podpages
 +    txtpages
 +"
 +
  HWACCEL_LIST="
      dxva2
      vaapi
@@@ -1151,73 -1071,22 +1203,27 @@@ PROGRAM_LIST=
  
  CONFIG_LIST="
      $COMPONENT_LIST
 +    $DOCUMENT_LIST
+     $EXTERNAL_LIBRARY_LIST
      $HWACCEL_LIST
      $LIBRARY_LIST
      $PROGRAM_LIST
-     avisynth
-     bzlib
-     crystalhd
      dct
 -    doc
 +    dwt
 +    fast_unaligned
      fft
-     fontconfig
-     frei0r
 +    ftrapv
-     gnutls
      gpl
      gray
      hardcoded_tables
-     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
 +    incompatible_fork_abi
      lsp
      lzo
      mdct
      memalign_hack
 +    memory_poisoning
      network
      nonfree
-     openal
-     openssl
      pic
      rdft
      runtime_cpudetect