diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-06-30 01:51:09 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-09-21 02:43:47 +0000 |
| commit | fa5b2498cac2c3c036ea89d07284aa5095ed1ced (patch) | |
| tree | 2b29afc80e5869e2a994a4b1756f366f7d333722 | |
| parent | 8b0bdd392317851b47bb62e90e1f6d28b47427ec (diff) | |
| download | bitcoin-fa5b2498cac2c3c036ea89d07284aa5095ed1ced.tar.xz | |
Bugfix: Allow building libbitcoinconsensus without any univalue
Github-Pull: #8293
Rebased-From: 8a270b25fc90495ce4b98b6d6e954fce92135dc1
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 4c7ef8b3ac..a545bc57b7 100644 --- a/configure.ac +++ b/configure.ac @@ -836,6 +836,12 @@ fi dnl univalue check +need_bundled_univalue=yes + +if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then + need_bundled_univalue=no +else + if test x$system_univalue != xno ; then found_univalue=no if test x$use_pkgconfig = xyes; then @@ -857,6 +863,7 @@ if test x$system_univalue != xno ; then if test x$found_univalue = xyes ; then system_univalue=yes + need_bundled_univalue=no elif test x$system_univalue = xyes ; then AC_MSG_ERROR([univalue not found]) else @@ -864,11 +871,14 @@ if test x$system_univalue != xno ; then fi fi -if test x$system_univalue = xno ; then +if test x$need_bundled_univalue = xyes ; then UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include' UNIVALUE_LIBS='univalue/libunivalue.la' fi -AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$system_univalue = xno]) + +fi + +AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$need_bundled_univalue = xyes]) AC_SUBST(UNIVALUE_CFLAGS) AC_SUBST(UNIVALUE_LIBS) @@ -1099,7 +1109,7 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" unset PKG_CONFIG_LIBDIR PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" -if test x$system_univalue = xno; then +if test x$need_bundled_univalue = xyes; then AC_CONFIG_SUBDIRS([src/univalue]) fi |