[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

trunk/xvidcore/build/generic/configure.in revision 1878, Mon Oct 5 09:55:46 2009 UTC branches/release-1_3-branch/xvidcore/build/generic/configure.in revision 1942, Thu Jan 6 14:12:29 2011 UTC
# Line 16  Line 16 
16  API_MINOR="3"  API_MINOR="3"
17    
18  dnl NASM/YASM version requirement  dnl NASM/YASM version requirement
19  minimum_yasm_minor_version=8  minimum_yasm_major_version=1
20  minimum_nasm_minor_version=0  minimum_nasm_minor_version=0
21  minimum_nasm_major_version=2  minimum_nasm_major_version=2
22  nasm_prog="nasm"  nasm_prog="nasm"
# Line 355  Line 355 
355         dnl Checking yasm version         dnl Checking yasm version
356         dnl         dnl
357         AC_MSG_CHECKING([for yasm version])         AC_MSG_CHECKING([for yasm version])
358         yasm_minor=`$yasm_prog --version | cut -d '.' -f 2 | cut -d ' ' -f 1`         yasm_major=`$yasm_prog --version | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 2`
359         if test -z $yasm_minor ; then         if test -z $yasm_major ; then
360            yasm_minor=-1            yasm_major=-1
361         fi         fi
362         AC_MSG_RESULT([$yasm_minor])         AC_MSG_RESULT([$yasm_major])
363    
364         dnl Actually, yasm >= 0.7.99.2161 should be ok         dnl Actually, yasm >= 0.7.99.2161 should be ok
365         dnl But I'm too lazy to check also the patch version...         dnl But I'm too lazy to check also the patch version...
366         if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then         if test "$yasm_major" -lt "$minimum_yasm_major_version" ; then
367           AC_MSG_WARN([yasm version is too old])           AC_MSG_WARN([yasm version is too old])
368         else         else
369           found_nasm_comp_prog="yes"           found_nasm_comp_prog="yes"
# Line 428  Line 428 
428                 MARK_FUNCS=""                 MARK_FUNCS=""
429                 ;;                 ;;
430             *darwin*)             *darwin*)
431                 AC_MSG_RESULT([macho])                 if test "$ARCHITECTURE" = "X86_64" ; then
432                 NASM_FORMAT="macho"                     AC_MSG_RESULT([macho64])
433                       NASM_FORMAT="macho64"
434                   else
435                       AC_MSG_RESULT([macho32])
436                       NASM_FORMAT="macho32"
437                   fi
438                 PREFIX="-DPREFIX"                 PREFIX="-DPREFIX"
439                 MARK_FUNCS=""                 MARK_FUNCS=""
440                 ;;                 ;;
Legend:
Removed from v.1878  
changed lines
  Added in v.1942
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4