# HG changeset patch # User nplourde # Date 1126450233 0 # Node ID f0f4403812a097be88d00e6c267a0983fc9089da # Parent efa4376257c7cbfb1fe037bb537a1d34fb483819 removed dep for perl_check on osx diff -r efa4376257c7 -r f0f4403812a0 configure --- a/configure Sun Sep 11 12:45:34 2005 +0000 +++ b/configure Sun Sep 11 14:50:33 2005 +0000 @@ -45,23 +45,12 @@ 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" "TMPP" + rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP" echo "Check \"$TMPLOG\" if you do not understand why it failed." exit 1 } @@ -559,7 +548,6 @@ 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 @@ -3276,35 +3264,8 @@ echocheck "Mac OS X APIs" if test "$_macosx" = auto ; 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 + productName=`/usr/bin/sw_vers -productName` + if test "$productName" = "Mac OS X" ; then _macosx=yes else _macosx=no @@ -7998,4 +7959,4 @@ fi # Last move: -rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP" "$TMPP" +rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP"