From: Bruno Haible Date: Sat, 30 May 2020 12:13:22 +0000 (+0200) Subject: crypto/gc-random: Fix link error on MSVC. X-Git-Tag: v1.0~4018 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=76656c5dca4b526390ccedee112e9af9652906bd;p=gnulib.git crypto/gc-random: Fix link error on MSVC. * m4/gc-random.m4 (gl_GC_RANDOM): Set LIB_GC_RAMDOM. * modules/crypto/gc-random (Link): New section. * modules/crypto/gc-tests (Makefile.am): Link test-gc against $(LIB_GC_RAMDOM). --- diff --git a/ChangeLog b/ChangeLog index bc21cf70b7..55381d5cd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-05-30 Bruno Haible + + crypto/gc-random: Fix link error on MSVC. + * m4/gc-random.m4 (gl_GC_RANDOM): Set LIB_GC_RAMDOM. + * modules/crypto/gc-random (Link): New section. + * modules/crypto/gc-tests (Makefile.am): Link test-gc against + $(LIB_GC_RAMDOM). + 2020-05-30 Bruno Haible Don't assume that UNICODE is not defined. diff --git a/m4/gc-random.m4 b/m4/gc-random.m4 index 09483daa52..de9c1bbb50 100644 --- a/m4/gc-random.m4 +++ b/m4/gc-random.m4 @@ -1,4 +1,4 @@ -# gc-random.m4 serial 6 +# gc-random.m4 serial 7 dnl Copyright (C) 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ AC_DEFUN([gl_GC_RANDOM], # Devices with randomness. # FIXME: Are these the best defaults? - AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in *openbsd* | *mirbsd*) @@ -84,4 +84,12 @@ AC_DEFUN([gl_GC_RANDOM], [defined to the name of the pseudo random device]) AC_DEFINE_UNQUOTED([NAME_OF_NONCE_DEVICE], ["$NAME_OF_NONCE_DEVICE"], [defined to the name of the unpredictable nonce device]) + + case $host_os in + mingw*) + LIB_GC_RAMDOM='-ladvapi32' ;; + *) + LIB_GC_RAMDOM= ;; + esac + AC_SUBST([LIB_GC_RAMDOM]) ]) diff --git a/modules/crypto/gc-random b/modules/crypto/gc-random index 2f1787178f..2ffec7ca83 100644 --- a/modules/crypto/gc-random +++ b/modules/crypto/gc-random @@ -16,6 +16,9 @@ Makefile.am: Include: "gc.h" +Link: +$(LIB_GC_RAMDOM) + License: LGPLv2+ diff --git a/modules/crypto/gc-tests b/modules/crypto/gc-tests index 7b153d18db..f3da986f3e 100644 --- a/modules/crypto/gc-tests +++ b/modules/crypto/gc-tests @@ -8,4 +8,4 @@ configure.ac: Makefile.am: TESTS += test-gc check_PROGRAMS += test-gc -test_gc_LDADD = $(LDADD) @LIB_CRYPTO@ +test_gc_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GC_RAMDOM)