File tree Expand file tree Collapse file tree 1 file changed +13
-3
lines changed Expand file tree Collapse file tree 1 file changed +13
-3
lines changed Original file line number Diff line number Diff line change 750750
751751dnl univalue check
752752
753+ need_bundled_univalue=yes
754+
755+ if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then
756+ need_bundled_univalue=no
757+ else
758+
753759if test x$system_univalue != xno ; then
754760 found_univalue=no
755761 if test x$use_pkgconfig = xyes; then
@@ -771,18 +777,22 @@ if test x$system_univalue != xno ; then
771777
772778 if test x$found_univalue = xyes ; then
773779 system_univalue=yes
780+ need_bundled_univalue=no
774781 elif test x$system_univalue = xyes ; then
775782 AC_MSG_ERROR ( [ univalue not found] )
776783 else
777784 system_univalue=no
778785 fi
779786fi
780787
781- if test x$system_univalue = xno ; then
788+ if test x$need_bundled_univalue = xyes ; then
782789 UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include'
783790 UNIVALUE_LIBS='univalue/libunivalue.la'
784791fi
785- AM_CONDITIONAL([ EMBEDDED_UNIVALUE] ,[ test x$system_univalue = xno] )
792+
793+ fi
794+
795+ AM_CONDITIONAL([ EMBEDDED_UNIVALUE] ,[ test x$need_bundled_univalue = xyes] )
786796AC_SUBST ( UNIVALUE_CFLAGS )
787797AC_SUBST ( UNIVALUE_LIBS )
788798
@@ -1002,7 +1012,7 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
10021012unset PKG_CONFIG_LIBDIR
10031013PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
10041014
1005- if test x$system_univalue = xno ; then
1015+ if test x$need_bundled_univalue = xyes ; then
10061016 AC_CONFIG_SUBDIRS ( [ src/univalue] )
10071017fi
10081018
You can’t perform that action at this time.
0 commit comments