From cabe085bb4371cc61286023ac9f6a8ce3138d7ea Mon Sep 17 00:00:00 2001 From: Tim Ruffing Date: Thu, 21 Jul 2022 11:03:31 +0200 Subject: [PATCH] configure: Remove pkgconfig macros again (reintroduced by mismerge) 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. --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index ba72736..1a8eb0d 100644 --- a/configure.ac +++ b/configure.ac @@ -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