mirror of
https://github.com/mpv-player/mpv
synced 2024-10-18 10:25:02 +02:00
removed dep for perl_check on osx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16455 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
5951f5b836
commit
ed3d28817c
47
configure
vendored
47
configure
vendored
@ -45,23 +45,12 @@ cc_check() {
|
|||||||
return "$TMP"
|
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
|
# Display error message, flushes tempfile, exit
|
||||||
die () {
|
die () {
|
||||||
echo
|
echo
|
||||||
echo "Error: $@" >&2
|
echo "Error: $@" >&2
|
||||||
echo >&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."
|
echo "Check \"$TMPLOG\" if you do not understand why it failed."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
@ -559,7 +548,6 @@ TMPC="$I/mplayer-conf-$RANDOM-$$.c"
|
|||||||
TMPCPP="$I/mplayer-conf-$RANDOM-$$.cpp"
|
TMPCPP="$I/mplayer-conf-$RANDOM-$$.cpp"
|
||||||
TMPO="$I/mplayer-conf-$RANDOM-$$.o"
|
TMPO="$I/mplayer-conf-$RANDOM-$$.o"
|
||||||
TMPS="$I/mplayer-conf-$RANDOM-$$.S"
|
TMPS="$I/mplayer-conf-$RANDOM-$$.S"
|
||||||
TMPP="$I/mplayer-conf-$RANDOM-$$.perl"
|
|
||||||
|
|
||||||
# config files
|
# config files
|
||||||
|
|
||||||
@ -3276,35 +3264,8 @@ echores "$_sys_sysinfo"
|
|||||||
|
|
||||||
echocheck "Mac OS X APIs"
|
echocheck "Mac OS X APIs"
|
||||||
if test "$_macosx" = auto ; then
|
if test "$_macosx" = auto ; then
|
||||||
|
productName=`/usr/bin/sw_vers -productName`
|
||||||
cat > $TMPP <<EOF
|
if test "$productName" = "Mac OS X" ; then
|
||||||
\$/ = \0;
|
|
||||||
|
|
||||||
open( PLIST, "/System/Library/CoreServices/SystemVersion.plist") || do {
|
|
||||||
print "Failed to open SystemVersion.plist\n";
|
|
||||||
exit (1);
|
|
||||||
};
|
|
||||||
|
|
||||||
\$plistData = <PLIST>;
|
|
||||||
\$plistData =~ /<dict>(.*?)<\/dict>/gis;
|
|
||||||
@items = split(/<key>/, \$plistData);
|
|
||||||
|
|
||||||
shift @items;
|
|
||||||
foreach \$item (@items) {
|
|
||||||
\$item =~ /(.*?)<\/key>.*?<string>(.*?)<\/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
|
_macosx=yes
|
||||||
else
|
else
|
||||||
_macosx=no
|
_macosx=no
|
||||||
@ -7998,4 +7959,4 @@ EOF
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Last move:
|
# Last move:
|
||||||
rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP" "$TMPP"
|
rm -f "$TMPO" "$TMPC" "$TMPS" "$TMPCPP"
|
||||||
|
Loading…
Reference in New Issue
Block a user