Skip to content

Commit 44a14af

Browse files
committed
build: Drop dead non-pkg-config code for qrencode check
1 parent 10cbae0 commit 44a14af

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

configure.ac

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,9 +1302,6 @@ if test x$use_pkgconfig = xyes; then
13021302
m4_ifdef(
13031303
[PKG_CHECK_MODULES],
13041304
[
1305-
if test x$use_qr != xno; then
1306-
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
1307-
fi
13081305
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then
13091306
PKG_CHECK_MODULES([EVENT], [libevent >= 2.0.21], [use_libevent=yes], [AC_MSG_ERROR(libevent version 2.0.21 or greater not found.)])
13101307
if test x$TARGET_OS != xwindows; then
@@ -1322,11 +1319,12 @@ else
13221319
AC_CHECK_LIB([event_pthreads],[main],EVENT_PTHREADS_LIBS=-levent_pthreads,AC_MSG_ERROR(libevent_pthreads missing))
13231320
fi
13241321
fi
1322+
fi
13251323

1326-
if test x$use_qr != xno; then
1327-
BITCOIN_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])])
1328-
BITCOIN_QT_CHECK([AC_CHECK_HEADER([qrencode.h],, have_qrencode=no)])
1329-
fi
1324+
dnl QR Code encoding library check
1325+
1326+
if test "x$use_qr" != xno; then
1327+
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
13301328
fi
13311329

13321330
dnl ZMQ check

0 commit comments

Comments
 (0)