highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-22 06:26:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#20201: build: pkg-config related cleanup

Browse Source 
c236f2e22868c7653441660fd50863f5fa36a512 build: Drop redundant AC_SUBST macros (Hennadii Stepanov)
90498121063c9a9b5e15144bf8959044adac3885 build: Drop redundant check of PKG_CHECK_MODULES presence (Hennadii Stepanov)

Pull request description:

  This PR:
  - does not change behavior
  - drops redundant `AC_SUBST` macros

  Also checks of PKG_CHECK_MODULES presence are removed because they are redundant due to the following code ab1feadf4e/configure.ac (L16-L20)

ACKs for top commit:
  fanquake:
    ACK c236f2e22868c7653441660fd50863f5fa36a512 - I see no difference in `config.log`s.

Tree-SHA512: 7ebbfc37123d693e034b8eea4aecbd9ef52b0ea5706b90bd282474e2d61ab0fedc8bca38aa3c9aa88cf2938339b7a491231b11865d39c682d60ef362082f22c5
This commit is contained in:
fanquake 2021-12-30 11:08:03 +08:00
commit 7e0cbc8ca4
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
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
if test "$use_bdb" != "no"; then
AC_SUBST(BDB_LIBS)
AC_DEFINE([USE_BDB], [1], [Define if BDB support should be compiled in])
use_bdb=yes
fi

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

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

11
configure.ac
View File

@ -1535,15 +1535,13 @@ dnl libmultiprocess library check
libmultiprocess_found=no
if test "$with_libmultiprocess" = "yes" || test "$with_libmultiprocess" = "auto"; then
m4_ifdef([PKG_CHECK_MODULES], [PKG_CHECK_MODULES([LIBMULTIPROCESS], [libmultiprocess], [
PKG_CHECK_MODULES([LIBMULTIPROCESS], [libmultiprocess], [
libmultiprocess_found=yes;
libmultiprocess_prefix=`$PKG_CONFIG --variable=prefix libmultiprocess`;
], [true])])
], [true])
elif test "$with_libmultiprocess" != "no"; then
AC_MSG_ERROR([--with-libmultiprocess=$with_libmultiprocess value is not yes, auto, or no])
fi
AC_SUBST(LIBMULTIPROCESS_CFLAGS)
AC_SUBST(LIBMULTIPROCESS_LIBS)
dnl Enable multiprocess check
@ -1846,16 +1844,11 @@ AC_SUBST(ENABLE_EXTERNAL_SIGNER)
AC_SUBST(USE_UPNP)
AC_SUBST(USE_QRCODE)
AC_SUBST(BOOST_LIBS)
AC_SUBST(SQLITE_LIBS)
AC_SUBST(TESTDEFS)
AC_SUBST(MINIUPNPC_CPPFLAGS)
AC_SUBST(MINIUPNPC_LIBS)
AC_SUBST(NATPMP_CPPFLAGS)
AC_SUBST(NATPMP_LIBS)
AC_SUBST(EVENT_LIBS)
AC_SUBST(EVENT_PTHREADS_LIBS)
AC_SUBST(ZMQ_LIBS)
AC_SUBST(QR_LIBS)
AC_SUBST(HAVE_GMTIME_R)
AC_SUBST(HAVE_FDATASYNC)
AC_SUBST(HAVE_FULLFSYNC)