Ticket #36777: patch-configure.diff

File patch-configure.diff, 1.8 KB (added by cjones051073 (Chris Jones), 11 years ago)
  • configure

    old new  
    436436            chklib64file=`ar t $chklib64 | awk '{if (NR == 2) print $1}'`
    437437            logmsg " ar x $chklib64 $chklib64file"
    438438            ar x $chklib64 $chklib64file
    439             logmsg " file $filearg $chklib64file | grep '64-bit'"
    440             if file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then
     439            logmsg " /usr/bin/file $filearg $chklib64file | grep '64-bit'"
     440            if /usr/bin/file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then
    441441                ret=1
    442442            fi
    443443            rm -f $chklib64file
    444444        fi
    445445    else
    446         if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
     446        if /usr/bin/file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
    447447            check_link $chklib64
    448448            ret=$link_result
    449449        else
    450             logmsg " file $filearg $chklib64 | grep '64-bit'"
    451             if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
     450            logmsg " /usr/bin/file $filearg $chklib64 | grep '64-bit'"
     451            if /usr/bin/file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
    452452                ret=1
    453453            fi
    454454        fi
     
    25972597   if `$cwhich freetype-config > /dev/null 2>&1` && test "x$host" = "x" ; then
    25982598      if test "x$macosx108" = "xyes" && (file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 || test "x$enable_cocoa" = "xyes"); then
    25992599         enable_builtin_freetype="yes"
    2600          if file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then
     2600         if /usr/bin/file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then
    26012601            result "XQuartz not installed"
    26022602         else
    26032603            result "using builtin freetype"