diff options
| author | Pieter Wuille <pieter@wuille.net> | 2021-04-23 11:35:15 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2021-04-23 11:35:15 -0700 |
| commit | a5a447a352463c7b75752aa08b6d9cb46aa051ea (patch) | |
| tree | 16b3dcf91f6f1fe7b8e9ec62ed76b12631edbf6f /src/secp256k1/build-aux/m4 | |
| parent | cabb5661234f8d832dbc3b65bf80b0acc02db0a0 (diff) | |
| parent | bdca9bcb6c9379707d09c63f02326884befbefb2 (diff) | |
Update libsecp256k1 subtree to latest upstream master
Diffstat (limited to 'src/secp256k1/build-aux/m4')
| -rw-r--r-- | src/secp256k1/build-aux/m4/ax_prog_cc_for_build.m4 | 2 | ||||
| -rw-r--r-- | src/secp256k1/build-aux/m4/bitcoin_secp.m4 | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/secp256k1/build-aux/m4/ax_prog_cc_for_build.m4 b/src/secp256k1/build-aux/m4/ax_prog_cc_for_build.m4 index 77fd346a79..7bcbf3200c 100644 --- a/src/secp256k1/build-aux/m4/ax_prog_cc_for_build.m4 +++ b/src/secp256k1/build-aux/m4/ax_prog_cc_for_build.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html +# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html # =========================================================================== # # SYNOPSIS diff --git a/src/secp256k1/build-aux/m4/bitcoin_secp.m4 b/src/secp256k1/build-aux/m4/bitcoin_secp.m4 index ece3d655ed..e57888ca18 100644 --- a/src/secp256k1/build-aux/m4/bitcoin_secp.m4 +++ b/src/secp256k1/build-aux/m4/bitcoin_secp.m4 @@ -75,15 +75,10 @@ if test x"$has_libcrypto" = x"yes" && test x"$has_openssl_ec" = x; then fi ]) -dnl -AC_DEFUN([SECP_GMP_CHECK],[ -if test x"$has_gmp" != x"yes"; then +AC_DEFUN([SECP_VALGRIND_CHECK],[ +if test x"$has_valgrind" != x"yes"; then CPPFLAGS_TEMP="$CPPFLAGS" - CPPFLAGS="$GMP_CPPFLAGS $CPPFLAGS" - LIBS_TEMP="$LIBS" - LIBS="$GMP_LIBS $LIBS" - AC_CHECK_HEADER(gmp.h,[AC_CHECK_LIB(gmp, __gmpz_init,[has_gmp=yes; GMP_LIBS="$GMP_LIBS -lgmp"; AC_DEFINE(HAVE_LIBGMP,1,[Define this symbol if libgmp is installed])])]) - CPPFLAGS="$CPPFLAGS_TEMP" - LIBS="$LIBS_TEMP" + CPPFLAGS="$VALGRIND_CPPFLAGS $CPPFLAGS" + AC_CHECK_HEADER([valgrind/memcheck.h], [has_valgrind=yes; AC_DEFINE(HAVE_VALGRIND,1,[Define this symbol if valgrind is installed])]) fi ]) |