sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 11:32:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#20201: pkg-config related cleanup

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2021-10-20 21:41:05 +03:00
parent 77862d8f5f
commit 9126006c18
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build-aux/m4/bitcoin_find_bdb48.m4
View File

@ -91,7 +91,6 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
fi fi
fi fi
if test "x$use_bdb" != "xno"; then if test "x$use_bdb" != "xno"; then
AC_SUBST(BDB_LIBS)
AC_DEFINE([USE_BDB], [1], [Define if BDB support should be compiled in]) AC_DEFINE([USE_BDB], [1], [Define if BDB support should be compiled in])
use_bdb=yes use_bdb=yes
fi fi

2
build-aux/m4/bitcoin_qt.m4
View File

@ -293,9 +293,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
AC_SUBST(QT_LIBS) AC_SUBST(QT_LIBS)
AC_SUBST(QT_LDFLAGS) AC_SUBST(QT_LDFLAGS)
AC_SUBST(QT_DBUS_INCLUDES) AC_SUBST(QT_DBUS_INCLUDES)
AC_SUBST(QT_DBUS_LIBS)
AC_SUBST(QT_TEST_INCLUDES) AC_SUBST(QT_TEST_INCLUDES)
AC_SUBST(QT_TEST_LIBS)
AC_SUBST(QT_SELECT, qt5) AC_SUBST(QT_SELECT, qt5)
AC_SUBST(MOC_DEFS) AC_SUBST(MOC_DEFS)
]) ])

11
configure.ac
View File

@ -1584,15 +1584,13 @@ dnl libmultiprocess library check
libmultiprocess_found=no libmultiprocess_found=no
if test "x$with_libmultiprocess" = xyes || test "x$with_libmultiprocess" = xauto; then if test "x$with_libmultiprocess" = xyes || test "x$with_libmultiprocess" = xauto; then
m4_ifdef([PKG_CHECK_MODULES], [PKG_CHECK_MODULES([LIBMULTIPROCESS], [libmultiprocess], [ PKG_CHECK_MODULES([LIBMULTIPROCESS], [libmultiprocess], [
libmultiprocess_found=yes; libmultiprocess_found=yes;
libmultiprocess_prefix=`$PKG_CONFIG --variable=prefix libmultiprocess`; libmultiprocess_prefix=`$PKG_CONFIG --variable=prefix libmultiprocess`;
], [true])]) ], [true])
elif test "x$with_libmultiprocess" != xno; then elif test "x$with_libmultiprocess" != xno; then
AC_MSG_ERROR([--with-libmultiprocess=$with_libmultiprocess value is not yes, auto, or no]) AC_MSG_ERROR([--with-libmultiprocess=$with_libmultiprocess value is not yes, auto, or no])
fi fi
AC_SUBST(LIBMULTIPROCESS_CFLAGS)
AC_SUBST(LIBMULTIPROCESS_LIBS)
dnl Enable multiprocess check dnl Enable multiprocess check
@ -1881,17 +1879,12 @@ AC_SUBST(USE_BDB)
AC_SUBST(USE_UPNP) AC_SUBST(USE_UPNP)
AC_SUBST(USE_QRCODE) AC_SUBST(USE_QRCODE)
AC_SUBST(BOOST_LIBS) AC_SUBST(BOOST_LIBS)
AC_SUBST(SQLITE_LIBS)
AC_SUBST(TESTDEFS) AC_SUBST(TESTDEFS)
AC_SUBST(MINIUPNPC_CPPFLAGS) AC_SUBST(MINIUPNPC_CPPFLAGS)
AC_SUBST(MINIUPNPC_LIBS) AC_SUBST(MINIUPNPC_LIBS)
AC_SUBST(GMP_LIBS) AC_SUBST(GMP_LIBS)
AC_SUBST(NATPMP_CPPFLAGS) AC_SUBST(NATPMP_CPPFLAGS)
AC_SUBST(NATPMP_LIBS) AC_SUBST(NATPMP_LIBS)
AC_SUBST(EVENT_LIBS)
AC_SUBST(EVENT_PTHREADS_LIBS)
AC_SUBST(ZMQ_LIBS)
AC_SUBST(QR_LIBS)
AC_SUBST(DSYMUTIL_FLAT) AC_SUBST(DSYMUTIL_FLAT)
AC_SUBST(HAVE_FDATASYNC) AC_SUBST(HAVE_FDATASYNC)
AC_SUBST(HAVE_FULLFSYNC) AC_SUBST(HAVE_FULLFSYNC)