[FFmpeg-cvslog] Merge commit '601f8dde13ccd0e1993b7840a0304fa2cfe53432'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Apr  9 14:49:09 2017 -0300| [6992c806e60df2ce2ad5096e47e9e35befc76abc] | committer: James Almer

Merge commit '601f8dde13ccd0e1993b7840a0304fa2cfe53432'

* commit '601f8dde13ccd0e1993b7840a0304fa2cfe53432':
  configure: Move COMPONENT_LIST to the bottom of CONFIG_LIST

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6992c806e60df2ce2ad5096e47e9e35befc76abc
---

 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 8eb94188b4..b3baeeb8f4 100755
--- a/configure
+++ b/configure
@@ -1678,8 +1678,8 @@ SUBSYSTEM_LIST="
     rdft
 "
 
+# COMPONENT_LIST needs to come last to ensure correct dependency checking
 CONFIG_LIST="
-    $COMPONENT_LIST
     $DOCUMENT_LIST
     $EXAMPLE_LIST
     $EXTERNAL_LIBRARY_LIST
@@ -1697,6 +1697,7 @@ CONFIG_LIST="
     thumb
     valgrind_backtrace
     xmm_clobber_test
+    $COMPONENT_LIST
 "
 
 THREADS_LIST="


======================================================================

diff --cc configure
index 8eb94188b4,61ce40ef35..b3baeeb8f4
--- a/configure
+++ b/configure
@@@ -1678,9 -1350,8 +1678,9 @@@ SUBSYSTEM_LIST=
      rdft
  "
  
+ # COMPONENT_LIST needs to come last to ensure correct dependency checking
  CONFIG_LIST="
-     $COMPONENT_LIST
 +    $DOCUMENT_LIST
      $EXAMPLE_LIST
      $EXTERNAL_LIBRARY_LIST
      $HWACCEL_LIBRARY_LIST