From a032ddea1f0ab6ed403499b7ea1febfcd1e6d2e9 Mon Sep 17 00:00:00 2001 From: Scott Sadler Date: Sat, 21 Oct 2017 17:54:17 -0700 Subject: [PATCH] configure.ac must not include cryptoconditions in AC_CONFIG_SUBDIRS because that disables shared linking. cryptoconditions must not include config.h because that includes conflicting variables. --- configure.ac | 2 +- src/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9f8f1900f..c471bab89 100644 --- a/configure.ac +++ b/configure.ac @@ -996,7 +996,7 @@ unset PKG_CONFIG_LIBDIR PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" -AC_CONFIG_SUBDIRS([src/secp256k1 src/univalue src/cryptoconditions]) +AC_CONFIG_SUBDIRS([src/secp256k1 src/univalue]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 8907fa54a..815d75d4c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -515,7 +515,8 @@ endif libzcashconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS) libzcashconsensus_la_LIBADD = $(CRYPTO_LIBS) libzcashconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL \ - -I$(builddir)/cryptoconditions/src/asn + -I$(builddir)/cryptoconditions/src/asn \ + -I$(builddir)/cryptoconditions/src endif #