|
|
@ -750,6 +750,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 |
|
|
@ -771,6 +777,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 |
|
|
@ -778,11 +785,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) |
|
|
|
|
|
|
|
|
|
|
@ -1002,7 +1012,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 |
|
|
|
|
|
|
|
|
|
|
|