RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 20:34:58 +00:00
Code Issues Releases Wiki Activity

add a cxx_check function to simplify C++ libs checking

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16800 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
aurel 2005-10-18 21:30:43 +00:00
parent 4ac392eaa1
commit d95e6a4df7
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure vendored
View File

@ -30,13 +30,13 @@ export LC_ALL
# Prefer these macros to full length text !
# These macros only return an error code - NO display is done
cc_check() {
compile_check() {
echo >> "$TMPLOG"
cat "$TMPC" >> "$TMPLOG"
cat "$1" >> "$TMPLOG"
echo >> "$TMPLOG"
echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG"
echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o $TMPO $@" >> "$TMPLOG"
rm -f "$TMPO"
$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" >> "$TMPLOG" 2>&1
$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o "$TMPO" "$@" >> "$TMPLOG" 2>&1
TMP="$?"
echo >> "$TMPLOG"
echo "ldd $TMPO" >> "$TMPLOG"
@ -45,6 +45,14 @@ cc_check() {
return "$TMP"
}
cc_check() {
compile_check $TMPC $@
}
cxx_check() {
compile_check $TMPCPP $@ -lstdc++
}
# Display error message, flushes tempfile, exit
die () {
echo
@ -5619,9 +5627,7 @@ class myclass {
int myclass::myreturn(void) { ret = 0; return ret ; }
int main(void) { myclass myobject; return myobject.myreturn(); }
EOF
echo "------------------------------------------------" >> "$TMPLOG"
cat "$TMPCPP" >> "$TMPLOG"
if ( $_cc "$TMPCPP" -o "$TMPO" && "$TMPO" ) >> "$TMPLOG" 2>&1 ; then
if cxx_check && "$TMPO" >> "$TMPLOG" 2>&1 ; then
_dshow=yes
echores "yes (C++ is ok)"
else
@ -5727,9 +5733,7 @@ echores "$_real"
echocheck "LIVE555 Streaming Media libraries"
if test "$_live" = auto && test "$_network" = yes ; then
_TMPC=$TMPC
TMPC=$TMPCPP
cat >$TMPC <<EOF
cat > $TMPCPP << EOF
#include <liveMedia.hh>
#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1090195200)
#error Please upgrade to version 2004.07.19 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
@ -5739,15 +5743,13 @@ EOF
_live=no
for I in "$_livelibdir" "$_libdir/live" "/usr/lib/live" "/usr/local/live" "/usr/local/lib/live" ; do
cc_check -I$I/liveMedia/include -I$I/UsageEnvironment/include -I$I/groupsock/include && _livelibdir=$I && _live=yes && break
cxx_check -I$I/liveMedia/include -I$I/UsageEnvironment/include -I$I/groupsock/include && _livelibdir=$I && _live=yes && break
done
if test "$_live" != yes ; then
if cc_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock; then
if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock; then
_live_dist=yes
fi
fi
TMPC=$_TMPC
fi
if test "$_live" = yes && test "$_network" = yes ; then
echores "yes (using $_livelibdir)"