mirror of https://github.com/mpv-player/mpv
_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
This commit is contained in:
parent
cf490c99f0
commit
9e49468c2d
|
@ -30,6 +30,7 @@ cc_check() {
|
||||||
cat "$TMPC" >> "$TMPLOG"
|
cat "$TMPC" >> "$TMPLOG"
|
||||||
echo >> "$TMPLOG"
|
echo >> "$TMPLOG"
|
||||||
echo "$_cc $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$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
|
( "$_cc" $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1
|
||||||
TMP="$?"
|
TMP="$?"
|
||||||
echo >> "$TMPLOG"
|
echo >> "$TMPLOG"
|
||||||
|
@ -1321,7 +1322,7 @@ if test "$_xdpms4" = yes ; then
|
||||||
echores "using xdpms4"
|
echores "using xdpms4"
|
||||||
elif test "$_xdpms3" = yes ; then
|
elif test "$_xdpms3" = yes ; then
|
||||||
_def_xdpms='#define HAVE_XDPMS 1'
|
_def_xdpms='#define HAVE_XDPMS 1'
|
||||||
_ld_x11='$_ld_x11 -lXdpms'
|
_ld_x11="$_ld_x11 -lXdpms"
|
||||||
echores "using xdpms3"
|
echores "using xdpms3"
|
||||||
else
|
else
|
||||||
_def_xdpms='#undef HAVE_XDPMS'
|
_def_xdpms='#undef HAVE_XDPMS'
|
||||||
|
|
Loading…
Reference in New Issue