diff mbox

[FFmpeg-devel] configure: extend the check for bcrypt

Message ID 20180415233434.4996-1-jamrial@gmail.com
State Accepted
Commit c04609eefce0183d460430f5014f7f8948170770
Headers show

Commit Message

James Almer April 15, 2018, 11:34 p.m. UTC
Some old mingw-w64 builds seem to provide an incomplete implementation
of the API. Add an extra check to make sure it's disabled for those.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

James Almer April 16, 2018, 2:04 p.m. UTC | #1
On 4/15/2018 8:34 PM, James Almer wrote:
> Some old mingw-w64 builds seem to provide an incomplete implementation
> of the API. Add an extra check to make sure it's disabled for those.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index d22b93a2d3..83a7648c57 100755
> --- a/configure
> +++ b/configure
> @@ -5830,7 +5830,8 @@ check_header asm/types.h
>  check_builtin stdatomic stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0); foo += bar"
>  
>  check_lib advapi32 "windows.h"            RegCloseKey          -ladvapi32
> -check_lib bcrypt   "windows.h bcrypt.h"   BCryptGenRandom      -lbcrypt
> +check_lib bcrypt   "windows.h bcrypt.h"   BCryptGenRandom      -lbcrypt &&
> +    check_cpp_condition bcrypt bcrypt.h "defined BCRYPT_RNG_ALGORITHM"
>  check_lib ole32    "windows.h"            CoTaskMemFree        -lole32
>  check_lib shell32  "windows.h shellapi.h" CommandLineToArgvW   -lshell32
>  check_lib psapi    "windows.h psapi.h"    GetProcessMemoryInfo -lpsapi

Pushed.
diff mbox

Patch

diff --git a/configure b/configure
index d22b93a2d3..83a7648c57 100755
--- a/configure
+++ b/configure
@@ -5830,7 +5830,8 @@  check_header asm/types.h
 check_builtin stdatomic stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0); foo += bar"
 
 check_lib advapi32 "windows.h"            RegCloseKey          -ladvapi32
-check_lib bcrypt   "windows.h bcrypt.h"   BCryptGenRandom      -lbcrypt
+check_lib bcrypt   "windows.h bcrypt.h"   BCryptGenRandom      -lbcrypt &&
+    check_cpp_condition bcrypt bcrypt.h "defined BCRYPT_RNG_ALGORITHM"
 check_lib ole32    "windows.h"            CoTaskMemFree        -lole32
 check_lib shell32  "windows.h shellapi.h" CommandLineToArgvW   -lshell32
 check_lib psapi    "windows.h psapi.h"    GetProcessMemoryInfo -lpsapi