[svn] / trunk / xvidcore / build / generic / configure.in Repository:
ViewVC logotype

Diff of /trunk/xvidcore/build/generic/configure.in

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

revision 1694, Sun Mar 5 04:01:07 2006 UTC revision 1794, Fri Nov 14 15:43:28 2008 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 356  Line 358 
358     fi     fi
359    
360     dnl if yasm hasn't been found, then check for nasm (not buggy version)     dnl if yasm hasn't been found, then check for nasm (not buggy version)
361     if test "$found_nasm_comp_prog" = "no" -a "$ARCHITECTURE" != "X86_64" ; then     if test "$found_nasm_comp_prog" = "no" ; then
362         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])
363         if test "$ac_nasm" = "yes" ; then         if test "$ac_nasm" = "yes" ; then
364             dnl             dnl
# 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               dnl need nasm 2.x for SSE3/4 and X86_64
383             if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then             if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then
384                 AC_MSG_WARN([nasm patch version is too old])               AC_MSG_WARN([nasm version is too old])
385             else             else
386                 found_nasm_comp_prog="yes"                 found_nasm_comp_prog="yes"
387                         chosen_asm_prog="$nasm_prog"                         chosen_asm_prog="$nasm_prog"
# Line 397  Line 407 
407                 PREFIX="-DPREFIX"                 PREFIX="-DPREFIX"
408                 MARK_FUNCS=""                 MARK_FUNCS=""
409                 ;;                 ;;
410               *darwin*)
411                   AC_MSG_RESULT([macho])
412                   NASM_FORMAT="macho"
413                   PREFIX="-DPREFIX"
414                   MARK_FUNCS=""
415                   ;;
416         esac         esac
417    
418         AS="$chosen_asm_prog"         AS="$chosen_asm_prog"
Legend:
Removed from v.1694  
changed lines
  Added in v.1794
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4