[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 1585, Sun Dec 19 14:05:55 2004 UTC revision 1586, Wed Jan 5 23:02:15 2005 UTC
# Line 163  Line 163 
163            AC_MSG_RESULT(ia32)            AC_MSG_RESULT(ia32)
164                  ARCHITECTURE="IA32"                  ARCHITECTURE="IA32"
165                  ;;                  ;;
166              x86_64)
167                    AC_MSG_RESULT(x86_64)
168                    ARCHITECTURE="X86_64"
169                    ;;
170                  powerpc)                  powerpc)
171                  AC_MSG_RESULT(PowerPC)                  AC_MSG_RESULT(PowerPC)
172                  ARCHITECTURE="PPC"                  ARCHITECTURE="PPC"
# Line 326  Line 330 
330  dnl IA32  dnl IA32
331  dnl  dnl
332    
333  if test "$ARCHITECTURE" = "IA32" ; then  if test "$ARCHITECTURE" = "IA32" -o "$ARCHITECTURE" = "X86_64" ; then
334    
335     dnl     dnl
336     dnl Checking for nasm compatible programs     dnl Checking for nasm compatible programs
# Line 345  Line 349 
349     fi     fi
350    
351     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)
352     if test "$found_nasm_comp_prog" = "no" ; then     if test "$found_nasm_comp_prog" = "no" -a "$ARCHITECTURE" != "X86_64" ; then
353         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])
354         if test "$ac_nasm" = "yes" ; then         if test "$ac_nasm" = "yes" ; then
355             dnl             dnl
# Line 389  Line 393 
393         esac         esac
394    
395         AS="$chosen_asm_prog"         AS="$chosen_asm_prog"
        AFLAGS="-I\$(<D)/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"  
396         ASSEMBLY_EXTENSION="asm"         ASSEMBLY_EXTENSION="asm"
397         ASSEMBLY_SOURCES="SRC_IA32"         AFLAGS="-I\$(<D)/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
398           ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"
399           if test "$ARCHITECTURE" = "X86_64" ; then
400                   AFLAGS=${AFLAGS}" -m amd64"
401           fi
402     else     else
403         AC_MSG_WARN([no correct assembler was found - Compiling generic sources only])         AC_MSG_WARN([no correct assembler was found - Compiling generic sources only])
404         ARCHITECTURE="GENERIC"         ARCHITECTURE="GENERIC"

Legend:
Removed from v.1585  
changed lines
  Added in v.1586

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