Skip to content

Commit 7e0cbc8

Browse files
committed
Merge bitcoin/bitcoin#20201: build: pkg-config related cleanup
c236f2e build: Drop redundant AC_SUBST macros (Hennadii Stepanov) 9049812 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 c236f2e - I see no difference in `config.log`s. Tree-SHA512: 7ebbfc37123d693e034b8eea4aecbd9ef52b0ea5706b90bd282474e2d61ab0fedc8bca38aa3c9aa88cf2938339b7a491231b11865d39c682d60ef362082f22c5
2 parents 587cbca + c236f2e commit 7e0cbc8

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

build-aux/m4/bitcoin_find_bdb48.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
9191
fi
9292
fi
9393
if test "$use_bdb" != "no"; then
94-
AC_SUBST(BDB_LIBS)
9594
AC_DEFINE([USE_BDB], [1], [Define if BDB support should be compiled in])
9695
use_bdb=yes
9796
fi

build-aux/m4/bitcoin_qt.m4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
278278
AC_SUBST(QT_LIBS)
279279
AC_SUBST(QT_LDFLAGS)
280280
AC_SUBST(QT_DBUS_INCLUDES)
281-
AC_SUBST(QT_DBUS_LIBS)
282281
AC_SUBST(QT_TEST_INCLUDES)
283-
AC_SUBST(QT_TEST_LIBS)
284282
AC_SUBST(QT_SELECT, qt5)
285283
AC_SUBST(MOC_DEFS)
286284
])

configure.ac

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,15 +1535,13 @@ dnl libmultiprocess library check
15351535

15361536
libmultiprocess_found=no
15371537
if test "$with_libmultiprocess" = "yes" || test "$with_libmultiprocess" = "auto"; then
1538-
m4_ifdef([PKG_CHECK_MODULES], [PKG_CHECK_MODULES([LIBMULTIPROCESS], [libmultiprocess], [
1538+
PKG_CHECK_MODULES([LIBMULTIPROCESS], [libmultiprocess], [
15391539
libmultiprocess_found=yes;
15401540
libmultiprocess_prefix=`$PKG_CONFIG --variable=prefix libmultiprocess`;
1541-
], [true])])
1541+
], [true])
15421542
elif test "$with_libmultiprocess" != "no"; then
15431543
AC_MSG_ERROR([--with-libmultiprocess=$with_libmultiprocess value is not yes, auto, or no])
15441544
fi
1545-
AC_SUBST(LIBMULTIPROCESS_CFLAGS)
1546-
AC_SUBST(LIBMULTIPROCESS_LIBS)
15471545

15481546
dnl Enable multiprocess check
15491547

@@ -1846,16 +1844,11 @@ AC_SUBST(ENABLE_EXTERNAL_SIGNER)
18461844
AC_SUBST(USE_UPNP)
18471845
AC_SUBST(USE_QRCODE)
18481846
AC_SUBST(BOOST_LIBS)
1849-
AC_SUBST(SQLITE_LIBS)
18501847
AC_SUBST(TESTDEFS)
18511848
AC_SUBST(MINIUPNPC_CPPFLAGS)
18521849
AC_SUBST(MINIUPNPC_LIBS)
18531850
AC_SUBST(NATPMP_CPPFLAGS)
18541851
AC_SUBST(NATPMP_LIBS)
1855-
AC_SUBST(EVENT_LIBS)
1856-
AC_SUBST(EVENT_PTHREADS_LIBS)
1857-
AC_SUBST(ZMQ_LIBS)
1858-
AC_SUBST(QR_LIBS)
18591852
AC_SUBST(HAVE_GMTIME_R)
18601853
AC_SUBST(HAVE_FDATASYNC)
18611854
AC_SUBST(HAVE_FULLFSYNC)

0 commit comments

Comments
 (0)