[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 1472, Sat Jun 12 13:02:12 2004 UTC revision 1535, Sun Aug 22 11:46:10 2004 UTC
# Line 18  Line 18 
18  dnl NASM version requirement  dnl NASM version requirement
19  minimum_nasm_patch_version=34  minimum_nasm_patch_version=34
20  nasm_prog="nasm"  nasm_prog="nasm"
21    yasm_prog="yasm"
22    
23  dnl Default CFLAGS -- Big impact on overall speed  dnl Default CFLAGS -- Big impact on overall speed
24  our_cflags_defaults="-Wall"  our_cflags_defaults="-Wall"
# Line 328  Line 329 
329  if test "$ARCHITECTURE" = "IA32" ; then  if test "$ARCHITECTURE" = "IA32" ; then
330    
331     dnl     dnl
332     dnl Checking nasm existence     dnl Checking for nasm compatible programs
333       dnl yasm is preferred over nasm, because... i can use it
334       dnl to profile assembly code ;-)
335     dnl     dnl
336    
337       found_nasm_comp_prog="no"
338       chosen_asm_prog=""
339    
340       dnl Check for yasm first
341       AC_CHECK_PROG([ac_yasm], [$yasm_prog], [yes], [no], , [yes])
342       if test "$ac_yasm" = "yes" ; then
343         found_nasm_comp_prog="yes"
344         chosen_asm_prog="$yasm_prog"
345       fi
346    
347       dnl if yasm hasn't been found, then check for nasm (not buggy version)
348       if test "$found_nasm_comp_prog" = "no" ; then
349     AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])     AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])
350     if test "$ac_nasm" = "yes" ; then     if test "$ac_nasm" = "yes" ; then
   
351        dnl        dnl
352        dnl Checking nasm patch version        dnl Checking nasm patch version
353        dnl        dnl
354        AC_MSG_CHECKING([for nasm patch version])        AC_MSG_CHECKING([for nasm patch version])
355        nasm_patch=`nasm -r | cut -d '.' -f 3 | cut -d ' ' -f 1`             nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
356        if test -z $nasm_patch ; then        if test -z $nasm_patch ; then
357          nasm_patch=-1          nasm_patch=-1
358        fi        fi
# Line 345  Line 360 
360    
361    
362        if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then        if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then
363          AC_MSG_WARN([nasm patch version too old - Compiling generic sources only])                 AC_MSG_WARN([nasm patch version is too old])
         ARCHITECTURE="GENERIC"  
364        else        else
365                   found_nasm_comp_prog="yes"
366                           chosen_asm_prog="$nasm_prog"
367               fi
368           fi
369       fi
370    
371           dnl           dnl
372           dnl Checking nasm format - win32 or elf     dnl Ok now sort what object format we must use
373           dnl           dnl
374           AC_MSG_CHECKING([for nasm object format])     if test "$found_nasm_comp_prog" = "yes" ; then
375           AC_MSG_CHECKING([for asm object format])
376           case "$target_os" in           case "$target_os" in
377                *bsd*|linux*|beos|irix*|solaris*)                *bsd*|linux*|beos|irix*|solaris*)
378                    AC_MSG_RESULT([elf])                    AC_MSG_RESULT([elf])
379                    NASM_FORMAT="elf"                    NASM_FORMAT="elf"
380                   MARK_FUNCS="-DMARK_FUNCS"
381                    PREFIX=""                    PREFIX=""
382                    ;;                    ;;
383                [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)                [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
384                    AC_MSG_RESULT([win32])                    AC_MSG_RESULT([win32])
385                    NASM_FORMAT="win32"                    NASM_FORMAT="win32"
386                    PREFIX="-DPREFIX"                    PREFIX="-DPREFIX"
387                   MARK_FUNCS=""
388                    ;;                    ;;
389            esac            esac
390    
391            AS=nasm         AS="$chosen_asm_prog"
392            AFLAGS="-I\$(<D)/ -f $NASM_FORMAT $PREFIX"         AFLAGS="-I\$(<D)/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
393            ASSEMBLY_EXTENSION="asm"            ASSEMBLY_EXTENSION="asm"
394            ASSEMBLY_SOURCES="SRC_IA32"            ASSEMBLY_SOURCES="SRC_IA32"
        fi  
   
395     else     else
396          AC_MSG_WARN([nasm not found - Compiling generic sources only])         AC_MSG_WARN([no correct assembler was found - Compiling generic sources only])
397          ARCHITECTURE="GENERIC"          ARCHITECTURE="GENERIC"
398     fi     fi
   
399  fi  fi
400    
401  dnl  dnl

Legend:
Removed from v.1472  
changed lines
  Added in v.1535

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