Mercurial > mplayer.hg
changeset 16799:da24dff28bbc
add a cxx_check function to simplify C++ libs checking
| author | aurel |
|---|---|
| date | Tue, 18 Oct 2005 21:30:43 +0000 |
| parents | 9d293690ecad |
| children | 3e8a61c10b47 |
| files | configure |
| diffstat | 1 files changed, 16 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Oct 18 20:26:08 2005 +0000 +++ b/configure Tue Oct 18 21:30:43 2005 +0000 @@ -30,13 +30,13 @@ # 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 @@ 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 @@ 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 @@ 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 @@ _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)"