Merge bitcoin-core/secp256k1#1128: configure: Remove pkgconfig macros again (reintroduced by mismerge)
cabe085bb4371cc61286023ac9f6a8ce3138d7ea configure: Remove pkgconfig macros again (reintroduced by mismerge) (Tim Ruffing) Pull request description: We had removed `PKG_PROG_PKG_CONFIG` in 21b2ebaf74222017f85123deb6f30a33c7678513 (#1090). But then then the not rebased (!) merge of 2be6ba0fedd0d2d62ba6f346d7ced7abde0d66e4 (#1084) brought that macro back at another location, without git complaining about a conflict. Fixes #1127. ACKs for top commit: fanquake: ACK cabe085bb4371cc61286023ac9f6a8ce3138d7ea hebasto: ACK cabe085bb4371cc61286023ac9f6a8ce3138d7ea jonasnick: ACK cabe085bb4371cc61286023ac9f6a8ce3138d7ea Tree-SHA512: ba497503db3a11e631b15c4fe875e62d892971c2c708d90b2f6be684e85d164043ea97c13af0452831eef41f3cf8230cd8a9eafa332dc5b5ae18e118b87c3828
This commit is contained in:
commit
9f8a13dc8e
@ -43,8 +43,6 @@ AS_UNSET(ac_cv_prog_AR)
|
|||||||
AS_UNSET(ac_cv_prog_ac_ct_AR)
|
AS_UNSET(ac_cv_prog_ac_ct_AR)
|
||||||
LT_INIT([win32-dll])
|
LT_INIT([win32-dll])
|
||||||
|
|
||||||
PKG_PROG_PKG_CONFIG
|
|
||||||
|
|
||||||
build_windows=no
|
build_windows=no
|
||||||
|
|
||||||
case $host_os in
|
case $host_os in
|
||||||
|
Loading…
x
Reference in New Issue
Block a user