Skip to content

Commit

Permalink
Merge bitcoin-core/secp256k1#1128: configure: Remove pkgconfig macros…
Browse files Browse the repository at this point in the history 
… again (reintroduced by mismerge)

cabe085 configure: Remove pkgconfig macros again (reintroduced by mismerge) (Tim Ruffing)

Pull request description:

  We had removed `PKG_PROG_PKG_CONFIG` in 21b2eba
  (#1090). But then then the not rebased (!) merge of 2be6ba0
  (#1084) brought that macro back at another location, without git
  complaining about a conflict.

  Fixes #1127.

ACKs for top commit:
  fanquake:
    ACK cabe085
  hebasto:
    ACK cabe085
  jonasnick:
    ACK cabe085

Tree-SHA512: ba497503db3a11e631b15c4fe875e62d892971c2c708d90b2f6be684e85d164043ea97c13af0452831eef41f3cf8230cd8a9eafa332dc5b5ae18e118b87c3828
  • Loading branch information
@real-or-random
real-or-random committed Jul 21, 2022
2 parents 3efeb9d + cabe085 commit 9f8a13d
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ AS_UNSET(ac_cv_prog_AR)
AS_UNSET(ac_cv_prog_ac_ct_AR)
LT_INIT([win32-dll])

PKG_PROG_PKG_CONFIG

build_windows=no

case $host_os in
Expand Down

0 comments on commit 9f8a13d

Please sign in to comment.