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 750
750
751
751
dnl univalue check
752
752
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
+
753
759
if test x$system_univalue != xno ; then
754
760
found_univalue=no
755
761
if test x$use_pkgconfig = xyes; then
@@ -771,18 +777,22 @@ if test x$system_univalue != xno ; then
771
777
772
778
if test x$found_univalue = xyes ; then
773
779
system_univalue=yes
780
+ need_bundled_univalue=no
774
781
elif test x$system_univalue = xyes ; then
775
782
AC_MSG_ERROR ( [ univalue not found] )
776
783
else
777
784
system_univalue=no
778
785
fi
779
786
fi
780
787
781
- if test x$system_univalue = xno ; then
788
+ if test x$need_bundled_univalue = xyes ; then
782
789
UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include'
783
790
UNIVALUE_LIBS='univalue/libunivalue.la'
784
791
fi
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] )
786
796
AC_SUBST ( UNIVALUE_CFLAGS )
787
797
AC_SUBST ( UNIVALUE_LIBS )
788
798
@@ -1002,7 +1012,7 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
1002
1012
unset PKG_CONFIG_LIBDIR
1003
1013
PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
1004
1014
1005
- if test x$system_univalue = xno ; then
1015
+ if test x$need_bundled_univalue = xyes ; then
1006
1016
AC_CONFIG_SUBDIRS ( [ src/univalue] )
1007
1017
fi
1008
1018
You can’t perform that action at this time.
0 commit comments