]>
Commit | Line | Data |
---|---|---|
27aee4eb JB |
1 | --- Feathercoin-0.19.1/configure.ac.orig 2020-08-06 11:29:39.000000000 +0200 |
2 | +++ Feathercoin-0.19.1/configure.ac 2020-09-21 22:22:56.190904468 +0200 | |
3 | @@ -1252,6 +1252,7 @@ | |
4 | else | |
5 | AC_DEFINE_UNQUOTED([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions]) | |
6 | fi | |
7 | + PKG_CHECK_MODULES([SECP256K1], [libsecp256k1],, [AC_MSG_ERROR(libsecp256k1 not found.)]) | |
8 | ] | |
9 | ) | |
10 | else | |
11 | @@ -1655,9 +1656,6 @@ | |
d27150c9 AM |
12 | AC_CONFIG_SUBDIRS([src/univalue]) |
13 | fi | |
14 | ||
27aee4eb | 15 | -ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --with-bignum=no --enable-module-recovery --disable-jni" |
d27150c9 AM |
16 | -AC_CONFIG_SUBDIRS([src/secp256k1]) |
17 | - | |
18 | AC_OUTPUT | |
19 | ||
20 | dnl Taken from https://wiki.debian.org/RpathIssue | |
d27150c9 AM |
21 | --- Feathercoin-0.16.3/src/Makefile.am~ 2018-09-22 09:16:24.000000000 +0200 |
22 | +++ Feathercoin-0.16.3/src/Makefile.am 2018-09-25 20:40:02.844966767 +0200 | |
23 | @@ -2,7 +2,7 @@ | |
24 | # Distributed under the MIT software license, see the accompanying | |
25 | # file COPYING or http://www.opensource.org/licenses/mit-license.php. | |
26 | ||
27 | -DIST_SUBDIRS = secp256k1 univalue | |
28 | +DIST_SUBDIRS = univalue | |
29 | ||
8d97d94d JP |
30 | AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS) |
31 | AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS) | |
d27150c9 AM |
32 | @@ -20,7 +20,7 @@ endif |
33 | ||
34 | BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) | |
35 | ||
36 | -BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include | |
37 | +BITCOIN_INCLUDES += $(SECP256K1_CFLAGS) | |
38 | BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) | |
39 | ||
40 | LIBBITCOIN_SERVER=libbitcoin_server.a | |
41 | @@ -30,8 +30,8 @@ LIBBITCOIN_CLI=libbitcoin_cli.a | |
42 | LIBBITCOIN_UTIL=libbitcoin_util.a | |
8d97d94d | 43 | LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.a |
d27150c9 AM |
44 | LIBBITCOINQT=qt/libbitcoinqt.a |
45 | -LIBSECP256K1=secp256k1/libsecp256k1.la | |
46 | - | |
47 | +LIBSECP256K1=$(SECP256K1_LIBS) | |
48 | + | |
49 | if ENABLE_ZMQ | |
50 | LIBBITCOIN_ZMQ=libbitcoin_zmq.a | |
51 | endif |