projects / packages / feathercoin.git / blame
| Commit | Line | Data |
|---|---|---|
| d27150c9 AM |
1 | --- Feathercoin-0.16.3/configure.ac~ 2018-09-22 09:16:24.000000000 +0200 |
| 2 | +++ Feathercoin-0.16.3/configure.ac 2018-09-25 20:30:45.640038984 +0200 | |
| 3 | @@ -1310,9 +1310,6 @@ if test x$need_bundled_univalue = xyes; | |
| 4 | AC_CONFIG_SUBDIRS([src/univalue]) | |
| 5 | fi | |
| 6 | ||
| 7 | -ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery --disable-jni" | |
| 8 | -AC_CONFIG_SUBDIRS([src/secp256k1]) | |
| 9 | - | |
| 10 | AC_OUTPUT | |
| 11 | ||
| 12 | dnl Taken from https://wiki.debian.org/RpathIssue | |
| 13 | --- Feathercoin-0.16.3/configure.ac~ 2018-09-25 20:31:22.000000000 +0200 | |
| 14 | +++ Feathercoin-0.16.3/configure.ac 2018-09-25 20:34:53.278016850 +0200 | |
| 15 | @@ -972,6 +972,7 @@ if test x$use_pkgconfig = xyes; then | |
| 16 | else | |
| 17 | AC_DEFINE_UNQUOTED([ENABLE_ZMQ],[0],[Define to 1 to enable ZMQ functions]) | |
| 18 | fi | |
| 19 | + PKG_CHECK_MODULES([SECP256K1], [libsecp256k1],, [AC_MSG_ERROR(libsecp256k1 not found.)]) | |
| 20 | ] | |
| 21 | ) | |
| 22 | else | |
| 23 | --- Feathercoin-0.16.3/src/Makefile.am~ 2018-09-22 09:16:24.000000000 +0200 | |
| 24 | +++ Feathercoin-0.16.3/src/Makefile.am 2018-09-25 20:40:02.844966767 +0200 | |
| 25 | @@ -2,7 +2,7 @@ | |
| 26 | # Distributed under the MIT software license, see the accompanying | |
| 27 | # file COPYING or http://www.opensource.org/licenses/mit-license.php. | |
| 28 | ||
| 29 | -DIST_SUBDIRS = secp256k1 univalue | |
| 30 | +DIST_SUBDIRS = univalue | |
| 31 | ||
| 32 | AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) | |
| 33 | AM_CXXFLAGS = $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS) | |
| 34 | @@ -20,7 +20,7 @@ endif | |
| 35 | ||
| 36 | BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) | |
| 37 | ||
| 38 | -BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include | |
| 39 | +BITCOIN_INCLUDES += $(SECP256K1_CFLAGS) | |
| 40 | BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) | |
| 41 | ||
| 42 | LIBBITCOIN_SERVER=libbitcoin_server.a | |
| 43 | @@ -30,8 +30,8 @@ LIBBITCOIN_CLI=libbitcoin_cli.a | |
| 44 | LIBBITCOIN_UTIL=libbitcoin_util.a | |
| 45 | LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a | |
| 46 | LIBBITCOINQT=qt/libbitcoinqt.a | |
| 47 | -LIBSECP256K1=secp256k1/libsecp256k1.la | |
| 48 | - | |
| 49 | +LIBSECP256K1=$(SECP256K1_LIBS) | |
| 50 | + | |
| 51 | if ENABLE_ZMQ | |
| 52 | LIBBITCOIN_ZMQ=libbitcoin_zmq.a | |
| 53 | endif |