# HG changeset patch # User nplourde # Date 1126377857 0 # Node ID d4355ddee12ed4e039f5cd76ed9f6c504414e6ae # Parent 564931dd69aa71e4873f5bb2b17c3eceb946a4d3 perl check for macosx diff -r 564931dd69aa -r d4355ddee12e configure --- a/configure Sat Sep 10 18:39:28 2005 +0000 +++ b/configure Sat Sep 10 18:44:17 2005 +0000 @@ -45,12 +45,23 @@ return "$TMP" } +perl_check() { + echo >> "$TMPLOG" + cat "$TMPP" >> "$TMPLOG" + echo >> "$TMPLOG" + echo "perl $TMPP" >> "$TMPLOG" + perl "$TMPP" >> "$TMPLOG" 2>&1 + TMP="$?" + echo >> "$TMPLOG" + return "$TMP" +} + # Display error message, flushes tempfile, exit die () { echo echo "Error: $@" >&2 echo >&2 - rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP" + rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP" "TMPP" echo "Check \"$TMPLOG\" if you do not understand why it failed." exit 1 } @@ -547,6 +558,7 @@ TMPCPP="$I/mplayer-conf-$RANDOM-$$.cpp" TMPO="$I/mplayer-conf-$RANDOM-$$.o" TMPS="$I/mplayer-conf-$RANDOM-$$.S" +TMPP="$I/mplayer-conf-$RANDOM-$$.perl" # config files @@ -3263,7 +3275,35 @@ echocheck "Mac OS X APIs" if test "$_macosx" = auto ; then - if darwin && ppc; then + +cat > $TMPP <; +\$plistData =~ /(.*?)<\/dict>/gis; +@items = split(//, \$plistData); + +shift @items; +foreach \$item (@items) { + \$item =~ /(.*?)<\/key>.*?(.*?)<\/string>/gis; + \$versiondata{ \$1 } = \$2; +} + +close(PLIST); + +if( \$versiondata{"ProductName"} eq "Mac OS X") { + exit(0); +} + +exit(1); +EOF + + if perl_check; then _macosx=yes else _macosx=no @@ -7958,4 +7998,4 @@ fi # Last move: -rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP" +rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP" "$TMPP"