diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-05 11:29:40 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-05 11:30:26 +0100 |
| commit | 7a88e3b0fcebf3c39a88158236c1382538478008 (patch) | |
| tree | cf6d1c79c7c9f2653d414cf2c0f1f254a8e1f5bb /src/secp256k1/build-aux/m4/bitcoin_secp.m4 | |
| parent | 7d42644dda33c1e1ab0c63730517f4005742f0e1 (diff) | |
| parent | 0dcfb91d5603f2212536d78260a3f2b16cb05a34 (diff) | |
| download | bitcoin-7a88e3b0fcebf3c39a88158236c1382538478008.tar.xz | |
Merge pull request #5425
87bddb7 Squashed 'src/secp256k1/' changes from ad2028f..b0210a9 (Pieter Wuille)
ffe3291 Remove gmp dependency and doc mentions (Pieter Wuille)
Diffstat (limited to 'src/secp256k1/build-aux/m4/bitcoin_secp.m4')
| -rw-r--r-- | src/secp256k1/build-aux/m4/bitcoin_secp.m4 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/secp256k1/build-aux/m4/bitcoin_secp.m4 b/src/secp256k1/build-aux/m4/bitcoin_secp.m4 index e6f3470ed7..4ca28f99cf 100644 --- a/src/secp256k1/build-aux/m4/bitcoin_secp.m4 +++ b/src/secp256k1/build-aux/m4/bitcoin_secp.m4 @@ -78,7 +78,13 @@ fi dnl AC_DEFUN([SECP_GMP_CHECK],[ if test x"$has_gmp" != x"yes"; then - AC_CHECK_HEADER(gmp.h,[AC_CHECK_LIB(gmp, __gmpz_init,[has_gmp=yes; GMP_LIBS=-lgmp; AC_DEFINE(HAVE_LIBGMP,1,[Define this symbol if libgmp is installed])])]) + 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" fi if test x"$set_field" = x"gmp" && test x"$has_gmp" != x"yes"; then AC_MSG_ERROR([$set_field field support explicitly requested but libgmp was not found]) |