foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-10 10:52:31 -05:00
Code Issues Activity

Merge #8293: Bugfix: Allow building libbitcoinconsensus without any univalue

Browse source 
8a270b2 Bugfix: Allow building libbitcoinconsensus without any univalue (Luke Dashjr)
This commit is contained in:
Wladimir J. van der Laan 2016-08-13 15:28:28 +02:00
commit efce84d888
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
configure.ac
View file

@ -834,6 +834,12 @@ fi
dnl univalue check 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 if test x$system_univalue != xno ; then
found_univalue=no found_univalue=no
if test x$use_pkgconfig = xyes; then if test x$use_pkgconfig = xyes; then
@ -855,6 +861,7 @@ if test x$system_univalue != xno ; then
if test x$found_univalue = xyes ; then if test x$found_univalue = xyes ; then
system_univalue=yes system_univalue=yes
need_bundled_univalue=no
elif test x$system_univalue = xyes ; then elif test x$system_univalue = xyes ; then
AC_MSG_ERROR([univalue not found]) AC_MSG_ERROR([univalue not found])
else else
@ -862,11 +869,14 @@ if test x$system_univalue != xno ; then
fi fi
fi fi
if test x$system_univalue = xno ; then if test x$need_bundled_univalue = xyes ; then
UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include' UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include'
UNIVALUE_LIBS='univalue/libunivalue.la' UNIVALUE_LIBS='univalue/libunivalue.la'
fi 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_CFLAGS)
AC_SUBST(UNIVALUE_LIBS) AC_SUBST(UNIVALUE_LIBS)
@ -1105,7 +1115,7 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
unset PKG_CONFIG_LIBDIR unset PKG_CONFIG_LIBDIR
PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" 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]) AC_CONFIG_SUBDIRS([src/univalue])
fi fi