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.

7 years ago · a032ddea1f
2 changed files with 3 additions and 2 deletions
--- 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

--- 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
 #