Ticket #37688: patch-configure.diff

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

    a b  
    441441            chklib64file=`ar t $chklib64 | awk '{if (NR == 2) print $1}'`
    442442            logmsg " ar x $chklib64 $chklib64file"
    443443            ar x $chklib64 $chklib64file
    444             logmsg " file $filearg $chklib64file | grep '64-bit'"
    445             if file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then
     444            logmsg " /usr/bin/file $filearg $chklib64file | grep '64-bit'"
     445            if /usr/bin/file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then
    446446                ret=1
    447447            fi
    448448            rm -f $chklib64file
    449449        fi
    450450    else
    451         if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
     451        if /usr/bin/file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
    452452            check_link $chklib64
    453453            ret=$link_result
    454454        else
    455             logmsg " file $filearg $chklib64 | grep '64-bit'"
    456             if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
     455            logmsg " /usr/bin/file $filearg $chklib64 | grep '64-bit'"
     456            if /usr/bin/file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
    457457                ret=1
    458458            fi
    459459        fi
     
    26862686   if `$cwhich freetype-config > /dev/null 2>&1` && test "x$host" = "x" ; then
    26872687      if test "x$macosx108" = "xyes" && (file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 || test "x$enable_cocoa" = "xyes"); then
    26882688         enable_builtin_freetype="yes"
    2689          if file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then
     2689         if /usr/bin/file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then
    26902690            result "XQuartz not installed"
    26912691         else
    26922692            result "using builtin freetype"