Ticket #38868: patch-configure.diff
File patch-configure.diff, 2.0 KB (added by cjones051073 (Chris Jones), 12 years ago) |
---|
-
configure
old new 436 436 chklib64file=`ar t $chklib64 | awk '{if (NR == 2) print $1}'` 437 437 logmsg " ar x $chklib64 $chklib64file" 438 438 ar x $chklib64 $chklib64file 439 logmsg " file $filearg $chklib64file | grep '64-bit'"440 if file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then439 logmsg " /usr/bin/file $filearg $chklib64file | grep '64-bit'" 440 if /usr/bin/file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then 441 441 ret=1 442 442 fi 443 443 rm -f $chklib64file 444 444 fi 445 445 else 446 if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then446 if /usr/bin/file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then 447 447 check_link $chklib64 448 448 ret=$link_result 449 449 else 450 logmsg " file $filearg $chklib64 | grep '64-bit'"451 if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then450 logmsg " /usr/bin/file $filearg $chklib64 | grep '64-bit'" 451 if /usr/bin/file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then 452 452 ret=1 453 453 fi 454 454 fi … … 2606 2606 2607 2607 checking_msg "freetype-config" 2608 2608 if `$cwhich freetype-config > /dev/null 2>&1` && test "x$host" = "x" ; then 2609 if test "x$macosx108" = "xyes" && ( file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 || test "x$enable_cocoa" = "xyes"); then2609 if test "x$macosx108" = "xyes" && (/usr/bin/file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 || test "x$enable_cocoa" = "xyes"); then 2610 2610 enable_builtin_freetype="yes" 2611 if file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then2611 if /usr/bin/file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then 2612 2612 result "XQuartz not installed" 2613 2613 else 2614 2614 result "using builtin freetype"