Skip to content

Commit 90b95e7

Browse files
committed
build: Drop dead non-pkg-config code for libevent check
1 parent 44a14af commit 90b95e7

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

configure.ac

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,27 +1297,12 @@ CPPFLAGS="$TEMP_CPPFLAGS"
12971297

12981298
fi
12991299

1300-
if test x$use_pkgconfig = xyes; then
1301-
: dnl
1302-
m4_ifdef(
1303-
[PKG_CHECK_MODULES],
1304-
[
1305-
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then
1306-
PKG_CHECK_MODULES([EVENT], [libevent >= 2.0.21], [use_libevent=yes], [AC_MSG_ERROR(libevent version 2.0.21 or greater not found.)])
1307-
if test x$TARGET_OS != xwindows; then
1308-
PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads >= 2.0.21],, [AC_MSG_ERROR(libevent_pthreads version 2.0.21 or greater not found.)])
1309-
fi
1310-
fi
1311-
]
1312-
)
1313-
else
1300+
dnl libevent check
13141301

1315-
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then
1316-
AC_CHECK_HEADER([event2/event.h], [use_libevent=yes], AC_MSG_ERROR(libevent headers missing),)
1317-
AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
1318-
if test x$TARGET_OS != xwindows; then
1319-
AC_CHECK_LIB([event_pthreads],[main],EVENT_PTHREADS_LIBS=-levent_pthreads,AC_MSG_ERROR(libevent_pthreads missing))
1320-
fi
1302+
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then
1303+
PKG_CHECK_MODULES([EVENT], [libevent >= 2.0.21], [use_libevent=yes], [AC_MSG_ERROR([libevent version 2.0.21 or greater not found.])])
1304+
if test x$TARGET_OS != xwindows; then
1305+
PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads >= 2.0.21],, [AC_MSG_ERROR([libevent_pthreads version 2.0.21 or greater not found.])])
13211306
fi
13221307
fi
13231308

0 commit comments

Comments
 (0)