summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-06-02 17:59:10 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-06-02 17:59:10 +0300
commit5aa7c02984536157448c234305c3aff7f7912727 (patch)
treea008e5346cc9bb9b388021d6853af34b3c25683c /configure
parent0f95b7031421eec3aacb43ce7965f41755bc6e40 (diff)
parent49c904b517a6bbb789ceaea80cb40323dadc1d29 (diff)
downloadmpv-5aa7c02984536157448c234305c3aff7f7912727.tar.bz2
mpv-5aa7c02984536157448c234305c3aff7f7912727.tar.xz
Merge svn changes up to r31284
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure b/configure
index b2a6a252c8..d1d21d7b03 100755
--- a/configure
+++ b/configure
@@ -59,12 +59,14 @@ _configuration="$*"
# Prefer these macros to full length text !
# These macros only return an error code - NO display is done
compile_check() {
+ source="$1"
+ shift
echo >> "$TMPLOG"
- cat "$1" >> "$TMPLOG"
+ cat "$source" >> "$TMPLOG"
echo >> "$TMPLOG"
- echo "$_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
+ echo "$_cc $source $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
rm -f "$TMPEXE"
- $_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
+ $_cc $CFLAGS "$source" $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
TMPRES="$?"
echo >> "$TMPLOG"
echo >> "$TMPLOG"