summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-03-04 21:53:42 +0200
committerUoti Urpala <uau@mplayer2.org>2012-03-09 20:48:55 +0200
commit2a2f8672188273831dacd58a0dc76055326e4ce2 (patch)
treeea06fb31aec736f1dfd1dcf9d2fd20d6b986a0b6 /configure
parent3f659fd1766c3ae649cbdac21485cda06d29ccb6 (diff)
downloadmpv-2a2f8672188273831dacd58a0dc76055326e4ce2.tar.bz2
mpv-2a2f8672188273831dacd58a0dc76055326e4ce2.tar.xz
configure: fix --enable-static
Hack around shell programming breakage that made Libav check fail with --enable-static.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 2 insertions, 3 deletions
diff --git a/configure b/configure
index 5a6433de95..53a9ead726 100755
--- a/configure
+++ b/configure
@@ -166,6 +166,7 @@ yasm_check() {
}
pkg_config_add() {
+ unset IFS # shell should not be used for programming
echo >> "$TMPLOG"
echo "$_pkg_config --cflags $@" >> "$TMPLOG"
ctmp=$($_pkg_config --cflags "$@" 2>> "$TMPLOG") || return $?
@@ -5802,9 +5803,7 @@ all_libav_libs="libavutil > 51.21.0:libavcodec > 53.34.0:libavformat > 53.20.0:l
echocheck "Libav ($all_libav_libs)"
if test "$ffmpeg" = auto ; then
IFS=":" # shell should not be used for programming
- if pkg_config_add $all_libav_libs ; then
- unset IFS
- else
+ if ! pkg_config_add $all_libav_libs ; then
die "Unable to find development files for some of the required Libav libraries above. Aborting."
fi
fi