From 5cfe83c16a0b110cbd8422828255795a2b814ebe Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 8 Sep 2015 14:00:27 -0400
Subject: Do not clear existing PKG_CONFIG_PATH settings.

In my setup, I use PKG_CONFIG_PATH to point to libfdk-aac; the previous
version of these files overrode this, making ffmpeg fail to configure
for not finding libfdk-aac.

Now, the PKG_CONFIG_PATH variable is always honored, with our own build
directory put in front of existing settings.
---
 scripts/ffmpeg-config | 11 ++++++++++-
 scripts/libass-config | 13 +++++++++++--
 scripts/mpv-config    | 11 ++++++++++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config
index 0bbc217..b83bfe9 100755
--- a/scripts/ffmpeg-config
+++ b/scripts/ffmpeg-config
@@ -28,8 +28,17 @@ then
     fi
 fi
 
+case "$PKG_CONFIG_PATH" in
+  '')
+    export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig"
+    ;;
+  *)
+    export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig:$PKG_CONFIG_PATH"
+    ;;
+esac
+
 echo Using ffmpeg options: $OPTIONS
 
 mkdir -p "$BUILD"/ffmpeg_build
 cd "$BUILD"/ffmpeg_build
-PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig "$BUILD"/ffmpeg/configure --prefix="$BUILD"/build_libs --enable-static --disable-shared $OPTIONS
+"$BUILD"/ffmpeg/configure --prefix="$BUILD"/build_libs --enable-static --disable-shared $OPTIONS
diff --git a/scripts/libass-config b/scripts/libass-config
index f257028..f391ae7 100755
--- a/scripts/libass-config
+++ b/scripts/libass-config
@@ -8,8 +8,17 @@ if "$BUILD"/scripts/test-libmpv ; then
     OPTIONS="$OPTIONS --with-pic"
 fi
 
+case "$PKG_CONFIG_PATH" in
+  '')
+    export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig"
+    ;;
+  *)
+    export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig:$PKG_CONFIG_PATH"
+    ;;
+esac
+
 cd "$BUILD"/libass
 # Later libass doesn't automatically run configure with autogen.sh anymore
-PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig ./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS
-PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig ./configure  --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS
+./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS
+./configure  --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS
 
diff --git a/scripts/mpv-config b/scripts/mpv-config
index b23cf4d..397c513 100755
--- a/scripts/mpv-config
+++ b/scripts/mpv-config
@@ -9,7 +9,16 @@ if test -f "$BUILD"/mpv_options ; then
 fi
 OPTIONS="$USER_OPTS"
 
+case "$PKG_CONFIG_PATH" in
+  '')
+    export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig"
+    ;;
+  *)
+    export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig:$PKG_CONFIG_PATH"
+    ;;
+esac
+
 echo Using mpv options: $OPTIONS
 
 cd "$BUILD"/mpv
-PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig ./waf configure $OPTIONS
+./waf configure $OPTIONS
-- 
cgit v1.2.3