Merge commit '68649bfed30a35dc3e45ea240541b2774b2f282b'

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

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

diff --cc configure
index ffe5278f9c92dd4115f2358307b802dd0fc52e62,173610a19c148a8e89b5cee80ac856bbc43b416d..54237fa65a0efb534daa4fc0108853b56ae9106b
--- 1/configure
--- 2/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
  "
  
 -    sdl
+ SYSTEM_LIBRARIES="
+     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