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

-revision 1536, Sun Aug 22 13:16:03 2004 UTC
+revision 1615, Tue May 17 15:55:24 2005 UTC
 Line 8
  AC_PREREQ([2.50])
- AC_INIT([XviD], [1.1.0-alpha], [xvid-devel@xvid.org])
+ AC_INIT([XviD], [1.1.0-beta2], [xvid-devel@xvid.org])
  AC_CONFIG_SRCDIR(configure.in)
  dnl Do not forget to increase that when needed.
 Line 163
            AC_MSG_RESULT(ia32)
                  ARCHITECTURE="IA32"
                  ;;
+           x86_64)
+                 AC_MSG_RESULT(x86_64)
+                 ARCHITECTURE="X86_64"
+                 ;;
                  powerpc)
                  AC_MSG_RESULT(PowerPC)
                  ARCHITECTURE="PPC"
-Line 326
+Line 330
  dnl IA32
  dnl
- if test "$ARCHITECTURE" = "IA32" ; then
+ if test "$ARCHITECTURE" = "IA32" -o "$ARCHITECTURE" = "X86_64" ; then
     dnl
     dnl Checking for nasm compatible programs
-Line 345
+Line 349
     fi
     dnl if yasm hasn't been found, then check for nasm (not buggy version)
-    if test "$found_nasm_comp_prog" = "no" ; then
+    if test "$found_nasm_comp_prog" = "no" -a "$ARCHITECTURE" != "X86_64" ; then
         AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])
         if test "$ac_nasm" = "yes" ; then
             dnl
-Line 389
+Line 393
         esac
         AS="$chosen_asm_prog"
-        AFLAGS="-I\$(<D)/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
         ASSEMBLY_EXTENSION="asm"
-        ASSEMBLY_SOURCES="SRC_IA32"
+        AFLAGS="-I\$(<D)/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
+        ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"
+        if test "$ARCHITECTURE" = "X86_64" ; then
+                AFLAGS=${AFLAGS}" -m amd64"
+        fi
     else
         AC_MSG_WARN([no correct assembler was found - Compiling generic sources only])
         ARCHITECTURE="GENERIC"
-Line 555
+Line 562
  fi
  dnl ==========================================================================
+ dnl Some gcc flags can't be used for gcc >= 3.4.0
+ dnl ==========================================================================
+ if test "$GCC" = "yes" ; then
+ cat << EOF > test.c
+ #include <stdio.h>
+ int main(int argc, char **argv)
+ {
+         if (*argv[[1]] == 'M') {
+                 printf("%d", __GNUC__);
+         }
+         if (*argv[[1]] == 'm') {
+                 printf("%d", __GNUC_MINOR__);
+         }
+         return 0;
+ }
+ EOF
+         $CC -o gcc-ver test.c
+         GCC_MAJOR=`./gcc-ver M`
+         GCC_MINOR=`./gcc-ver m`
+         rm -f test.c
+         rm -f gcc-ver
+         # GCC 4.x
+         if test $GCC_MAJOR -gt 3 ; then
+                 CFLAGS=`echo $CFLAGS | sed s,"-mcpu","-mtune",g`
+                 CFLAGS=`echo $CFLAGS | sed s,'-freduce-all-givs','',g`
+                 CFLAGS=`echo $CFLAGS | sed s,'-fmove-all-movables','',g`
+                 CFLAGS=`echo $CFLAGS | sed s,'-fnew-ra','',g`
+                 CFLAGS=`echo $CFLAGS | sed s,'-fwritable-strings','',g`
+         fi
+         # GCC 3.4.x
+         if test $GCC_MAJOR -eq 3 && $GCC_MINOR -gt 3 ; then
+                 CFLAGS=`echo $CFLAGS | sed s,"-mcpu","-mtune",g`
+         fi
+ fi
+ dnl ==========================================================================
  dnl
  dnl Substitions
  dnl

 Legend:



Removed from v.1536
 


changed lines


 
Added in v.1615
 Legend:



Removed from v.1536
 


changed lines


 
Added in v.1615
-Removed from v.1536
+Added in v.1615

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