From 517ed0030f340d3b8f3f2aee1cbac23f5e9da30a Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Sun, 10 Jun 2018 16:31:46 -0400
Subject: contrib: make: Remove --enable-local-autotools and
 --enable-local-pkgconfig.

Closes #549.
---
 contrib/ffmpeg/module.defs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'contrib/ffmpeg')

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 690f2c1e7..47a67aa99 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -81,13 +81,9 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     FFMPEG.CONFIGURE.extra += \
         --target-os=mingw32 \
         --arch=$(BUILD.machine) \
-        --cross-prefix=$(BUILD.cross.prefix)
+        --cross-prefix=$(BUILD.cross.prefix) \
+        --pkg-config=$(PKGCONFIG.exe)
     FFMPEG.GCC.args.extra += -fno-common
-    ifeq (1,$(FEATURE.local_pkgconfig))
-        FFMPEG.CONFIGURE.extra += --pkg-config="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/$(PKGCONFIG.exe))"
-    else
-        FFMPEG.CONFIGURE.extra += --pkg-config=$(PKGCONFIG.exe)
-    endif
 endif
 
 ifneq (none,$(FFMPEG.GCC.g))
-- 
cgit v1.2.3