Mercurial > mplayer.hg
comparison configure @ 3022:95dc79ab9f0d
_ld_x11 patch by Anders Johansson <ajh@atri.curtin.edu.au>
reset content of $TMPO before cc_check to avoid incorrect ldd reports
author | pl |
---|---|
date | Tue, 20 Nov 2001 12:31:35 +0000 |
parents | 8c765d4a31b8 |
children | 3bcd9ad27b6d |
comparison
equal
deleted
inserted
replaced
3021:8c765d4a31b8 | 3022:95dc79ab9f0d |
---|---|
28 cc_check() { | 28 cc_check() { |
29 echo >> "$TMPLOG" | 29 echo >> "$TMPLOG" |
30 cat "$TMPC" >> "$TMPLOG" | 30 cat "$TMPC" >> "$TMPLOG" |
31 echo >> "$TMPLOG" | 31 echo >> "$TMPLOG" |
32 echo "$_cc $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG" | 32 echo "$_cc $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG" |
33 > "$TMPO" | |
33 ( "$_cc" $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1 | 34 ( "$_cc" $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1 |
34 TMP="$?" | 35 TMP="$?" |
35 echo >> "$TMPLOG" | 36 echo >> "$TMPLOG" |
36 echo "ldd $TMPO" >> "$TMPLOG" | 37 echo "ldd $TMPO" >> "$TMPLOG" |
37 ( ldd "$TMPO" ) >> "$TMPLOG" 2>&1 | 38 ( ldd "$TMPO" ) >> "$TMPLOG" 2>&1 |
1319 if test "$_xdpms4" = yes ; then | 1320 if test "$_xdpms4" = yes ; then |
1320 _def_xdpms='#define HAVE_XDPMS 1' | 1321 _def_xdpms='#define HAVE_XDPMS 1' |
1321 echores "using xdpms4" | 1322 echores "using xdpms4" |
1322 elif test "$_xdpms3" = yes ; then | 1323 elif test "$_xdpms3" = yes ; then |
1323 _def_xdpms='#define HAVE_XDPMS 1' | 1324 _def_xdpms='#define HAVE_XDPMS 1' |
1324 _ld_x11='$_ld_x11 -lXdpms' | 1325 _ld_x11="$_ld_x11 -lXdpms" |
1325 echores "using xdpms3" | 1326 echores "using xdpms3" |
1326 else | 1327 else |
1327 _def_xdpms='#undef HAVE_XDPMS' | 1328 _def_xdpms='#undef HAVE_XDPMS' |
1328 echores "no" | 1329 echores "no" |
1329 fi | 1330 fi |