[svn] / branches / release-1_3-branch / xvidcore / build / generic / configure.in Repository:
ViewVC logotype

Diff of /branches/release-1_3-branch/xvidcore/build/generic/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1787, Tue Sep 11 12:41:13 2007 UTC revision 1788, Fri Nov 23 10:44:11 2007 UTC
# Line 17  Line 17 
17    
18  dnl NASM version requirement  dnl NASM version requirement
19  minimum_nasm_patch_version=34  minimum_nasm_patch_version=34
20    minimum_nasm_minor_version=99
21    minimum_nasm_major_version=2
22  nasm_prog="nasm"  nasm_prog="nasm"
23  yasm_prog="yasm"  yasm_prog="yasm"
24    
# Line 364  Line 366 
366             dnl             dnl
367             AC_MSG_CHECKING([for nasm patch version])             AC_MSG_CHECKING([for nasm patch version])
368             nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`             nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
369               nasm_minor=`$nasm_prog -v | cut -d '.' -f 2 | cut -d ' ' -f 1`
370               nasm_major=`$nasm_prog -v | cut -d '.' -f 1 | cut -d ' ' -f 3`
371             if test -z $nasm_patch ; then             if test -z $nasm_patch ; then
372                nasm_patch=-1                nasm_patch=-1
373             fi             fi
374               if test -z $nasm_minor ; then
375                  nasm_minor=-1
376               fi
377               if test -z $nasm_major ; then
378                  nasm_major=-1
379               fi
380             AC_MSG_RESULT([$nasm_patch])             AC_MSG_RESULT([$nasm_patch])
381    
   
382             if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then             if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then
383                 AC_MSG_WARN([nasm patch version is too old])                if test "$nasm_minor" -lt "$minimum_nasm_minor_version" ; then
384                     if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then
385                        AC_MSG_WARN([nasm version is too old])
386                     else
387                       found_nasm_comp_prog="yes"
388                               chosen_asm_prog="$nasm_prog"
389                     fi
390                  else
391                     found_nasm_comp_prog="yes"
392                         chosen_asm_prog="$nasm_prog"
393                  fi
394             else             else
395                 found_nasm_comp_prog="yes"                 found_nasm_comp_prog="yes"
396                         chosen_asm_prog="$nasm_prog"                         chosen_asm_prog="$nasm_prog"

Legend:
Removed from v.1787  
changed lines
  Added in v.1788

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4