Merge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768'

* commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768':
  configure: Move list of external libs to a separate variable

Conflicts:
	configure

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

1 files changed, 53 insertions, 49 deletions

diff --git a/configure b/configure
index 774df50800..4a28675f11 100755
--- a/configure
+++ b/configure
@@ -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='