[FFmpeg-cvslog] Merge commit '68649bfed30a35dc3e45ea240541b2774b2f282b'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 23:21:55 2017 -0300| [3749d0defc38235d1e578b4a40d734e2d47ce243] | committer: James Almer

Merge commit '68649bfed30a35dc3e45ea240541b2774b2f282b'

* commit '68649bfed30a35dc3e45ea240541b2774b2f282b':
  configure: Group system feature variables and system libraries together

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

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

 configure | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index ffe5278f9c..54237fa65a 100755
--- a/configure
+++ b/configure
@@ -1986,6 +1986,17 @@ MATH_FUNCS="
     truncf
 "
 
+SYSTEM_FEATURES="
+    atomics_native
+    dos_paths
+    libc_msvcrt
+    MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
+    section_data_rel_ro
+    threads
+    uwp
+    winrt
+"
+
 SYSTEM_FUNCS="
     access
     aligned_malloc
@@ -2037,6 +2048,13 @@ SYSTEM_FUNCS="
     wglGetProcAddress
 "
 
+SYSTEM_LIBRARIES="
+    vaapi_drm
+    vaapi_x11
+    vdpau_x11
+    wincrypt
+"
+
 TOOLCHAIN_FEATURES="
     as_arch_directive
     as_fpu_directive
@@ -2093,27 +2111,17 @@ HAVE_LIST="
     $HEADERS_LIST
     $INTRINSICS_LIST
     $MATH_FUNCS
+    $SYSTEM_FEATURES
     $SYSTEM_FUNCS
+    $SYSTEM_LIBRARIES
     $THREADS_LIST
     $TOOLCHAIN_FEATURES
     $TYPES_LIST
-    atomics_native
-    dos_paths
-    libc_msvcrt
     makeinfo
     makeinfo_html
-    MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
     perl
     pod2man
-    section_data_rel_ro
     texi2html
-    threads
-    uwp
-    vaapi_drm
-    vaapi_x11
-    vdpau_x11
-    winrt
-    wincrypt
 "
 
 # options emitted with CONFIG_ prefix but not available on the command line


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

diff --cc configure
index ffe5278f9c,173610a19c..54237fa65a
--- a/configure
+++ b/configure
@@@ -1986,10 -1601,17 +1986,21 @@@ MATH_FUNCS=
      truncf
  "
  
+ SYSTEM_FEATURES="
++    atomics_native
+     dos_paths
+     libc_msvcrt
+     MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
+     section_data_rel_ro
+     threads
+     uwp
++    winrt
+ "
+ 
  SYSTEM_FUNCS="
 +    access
      aligned_malloc
 +    arc4random
      clock_gettime
      closesocket
      CommandLineToArgvW
@@@ -2032,11 -1645,17 +2043,18 @@@
      sysconf
      sysctl
      usleep
 +    UTGetOSTypeFromString
      VirtualAlloc
 +    wglGetProcAddress
  "
  
+ SYSTEM_LIBRARIES="
 -    sdl
+     vaapi_drm
+     vaapi_x11
+     vdpau_x11
+     wincrypt
+ "
+ 
  TOOLCHAIN_FEATURES="
      as_arch_directive
      as_fpu_directive
@@@ -2097,23 -1709,6 +2117,11 @@@ HAVE_LIST=
      $THREADS_LIST
      $TOOLCHAIN_FEATURES
      $TYPES_LIST
-     atomics_native
-     dos_paths
-     libc_msvcrt
 +    makeinfo
 +    makeinfo_html
-     MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
 +    perl
 +    pod2man
-     section_data_rel_ro
 +    texi2html
-     threads
-     uwp
-     vaapi_drm
-     vaapi_x11
-     vdpau_x11
-     winrt
-     wincrypt
  "
  
  # options emitted with CONFIG_ prefix but not available on the command line