Ticket #37688: patch-configure.diff
File patch-configure.diff, 1.8 KB (added by cjones051073 (Chris Jones), 12 years ago) |
---|
-
(a) configure-original vs. (b) configure
a b 441 441 chklib64file=`ar t $chklib64 | awk '{if (NR == 2) print $1}'` 442 442 logmsg " ar x $chklib64 $chklib64file" 443 443 ar x $chklib64 $chklib64file 444 logmsg " file $filearg $chklib64file | grep '64-bit'"445 if file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then444 logmsg " /usr/bin/file $filearg $chklib64file | grep '64-bit'" 445 if /usr/bin/file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then 446 446 ret=1 447 447 fi 448 448 rm -f $chklib64file 449 449 fi 450 450 else 451 if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then451 if /usr/bin/file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then 452 452 check_link $chklib64 453 453 ret=$link_result 454 454 else 455 logmsg " file $filearg $chklib64 | grep '64-bit'"456 if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then455 logmsg " /usr/bin/file $filearg $chklib64 | grep '64-bit'" 456 if /usr/bin/file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then 457 457 ret=1 458 458 fi 459 459 fi … … 2686 2686 if `$cwhich freetype-config > /dev/null 2>&1` && test "x$host" = "x" ; then 2687 2687 if test "x$macosx108" = "xyes" && (file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 || test "x$enable_cocoa" = "xyes"); then 2688 2688 enable_builtin_freetype="yes" 2689 if file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then2689 if /usr/bin/file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then 2690 2690 result "XQuartz not installed" 2691 2691 else 2692 2692 result "using builtin freetype"