diff options
| author | fanquake <fanquake@gmail.com> | 2021-12-30 11:08:03 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-12-30 11:08:24 +0800 |
| commit | 7e0cbc8ca4fe87323a5beae59514e55b7d0e4f48 (patch) | |
| tree | eba72385344b933dd75dc389a994b8e3a9ff6629 | |
| parent | 587cbca826d7331633a30b5a6cce170e3dbe2612 (diff) | |
| parent | c236f2e22868c7653441660fd50863f5fa36a512 (diff) | |
Merge bitcoin/bitcoin#20201: build: pkg-config related cleanup
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 https://github.com/bitcoin/bitcoin/blob/ab1feadf4e6cd4f5f2c7e74cea1c7baad61458ba/configure.ac#L16-L20
ACKs for top commit:
fanquake:
ACK c236f2e22868c7653441660fd50863f5fa36a512 - I see no difference in `config.log`s.
Tree-SHA512: 7ebbfc37123d693e034b8eea4aecbd9ef52b0ea5706b90bd282474e2d61ab0fedc8bca38aa3c9aa88cf2938339b7a491231b11865d39c682d60ef362082f22c5
| -rw-r--r-- | build-aux/m4/bitcoin_find_bdb48.m4 | 1 | ||||
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 2 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 2 insertions, 12 deletions
diff --git a/build-aux/m4/bitcoin_find_bdb48.m4 b/build-aux/m4/bitcoin_find_bdb48.m4 index d2f01907c3..3ef7fab5b5 100644 --- a/build-aux/m4/bitcoin_find_bdb48.m4 +++ b/build-aux/m4/bitcoin_find_bdb48.m4 @@ -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 diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 874f9afa67..1454e33f6e 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -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) ]) diff --git a/configure.ac b/configure.ac index a20dd86e4d..d21b3eabeb 100644 --- a/configure.ac +++ b/configure.ac @@ -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) |