DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Scott Sadler
2017-10-21 17:54:17 -07:00
parent 2b67565e51
commit a032ddea1f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

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

3
src/Makefile.am
View File

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