summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorpl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-20 12:31:35 +0000
committerpl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-20 12:31:35 +0000
commit9e49468c2d8bce6fdbf4536716ca76ab7922d18c (patch)
tree4595535ce132cebd515e695ff422db04685620a2 /configure
parentcf490c99f070d32122977cc9da7246a3b6b35277 (diff)
downloadmpv-9e49468c2d8bce6fdbf4536716ca76ab7922d18c.tar.bz2
mpv-9e49468c2d8bce6fdbf4536716ca76ab7922d18c.tar.xz
_ld_x11 patch by Anders Johansson <ajh@atri.curtin.edu.au>
reset content of $TMPO before cc_check to avoid incorrect ldd reports git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3023 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index e29b3b7c8e..827b65301d 100755
--- a/configure
+++ b/configure
@@ -30,6 +30,7 @@ cc_check() {
cat "$TMPC" >> "$TMPLOG"
echo >> "$TMPLOG"
echo "$_cc $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG"
+ > "$TMPO"
( "$_cc" $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1
TMP="$?"
echo >> "$TMPLOG"
@@ -1321,7 +1322,7 @@ if test "$_xdpms4" = yes ; then
echores "using xdpms4"
elif test "$_xdpms3" = yes ; then
_def_xdpms='#define HAVE_XDPMS 1'
- _ld_x11='$_ld_x11 -lXdpms'
+ _ld_x11="$_ld_x11 -lXdpms"
echores "using xdpms3"
else
_def_xdpms='#undef HAVE_XDPMS'