--- trunk/xvidcore/build/generic/configure.in	2004/05/21 14:40:15	1451
+++ trunk/xvidcore/build/generic/configure.in	2005/04/04 23:49:37	1609
@@ -8,16 +8,17 @@
 
 AC_PREREQ([2.50])
 
-AC_INIT([XviD], [1.0.0], [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.
 API_MAJOR="4"
-API_MINOR="0"
+API_MINOR="1"
 
 dnl NASM version requirement
 minimum_nasm_patch_version=34
 nasm_prog="nasm"
+yasm_prog="yasm"
 
 dnl Default CFLAGS -- Big impact on overall speed
 our_cflags_defaults="-Wall"
@@ -161,6 +162,10 @@
 	  i[[3456]]86)
 	  AC_MSG_RESULT(ia32)
 	  	ARCHITECTURE="IA32"
+                ;;
+          x86_64)
+                AC_MSG_RESULT(x86_64)
+                ARCHITECTURE="X86_64"
 		;;	
 		powerpc)
 		AC_MSG_RESULT(PowerPC)
@@ -297,7 +302,7 @@
 	;;
      *)
         AC_MSG_RESULT([Unknown Platform (Using default -shared -lc -lm)])
-	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+    STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
 	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
 	SPECIFIC_LDFLAGS=""
 	SPECIFIC_CFLAGS=""
@@ -325,58 +330,79 @@
 dnl IA32
 dnl
 
-if test "$ARCHITECTURE" = "IA32" ; then
+if test "$ARCHITECTURE" = "IA32" -o "$ARCHITECTURE" = "X86_64" ; then
 
    dnl
-   dnl Checking nasm existence
+   dnl Checking for nasm compatible programs
+   dnl yasm is preferred over nasm, because... i can use it
+   dnl to profile assembly code ;-)
    dnl
-   AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])
-   if test "$ac_nasm" = "yes" ; then
-
-      dnl
-      dnl Checking nasm patch version
-      dnl
-      AC_MSG_CHECKING([for nasm patch version])
-      nasm_patch=`nasm -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
-      if test -z $nasm_patch ; then
-        nasm_patch=-1
-      fi
-      AC_MSG_RESULT([$nasm_patch])
 
+   found_nasm_comp_prog="no"
+   chosen_asm_prog=""
 
-      if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then
-        AC_MSG_WARN([nasm patch version too old - Compiling generic sources only])
-	ARCHITECTURE="GENERIC"
-      else
+   dnl Check for yasm first
+   AC_CHECK_PROG([ac_yasm], [$yasm_prog], [yes], [no], , [yes])
+   if test "$ac_yasm" = "yes" ; then
+     found_nasm_comp_prog="yes"
+     chosen_asm_prog="$yasm_prog"
+   fi
 
-         dnl
-         dnl Checking nasm format - win32 or elf
-         dnl
-         AC_MSG_CHECKING([for nasm object format])
-         case "$target_os" in
-              *bsd*|linux*|beos|irix*|solaris*)
-                  AC_MSG_RESULT([elf])
-                  NASM_FORMAT="elf"
-		  PREFIX=""
-                  ;;
-              [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
-                  AC_MSG_RESULT([win32])
-                  NASM_FORMAT="win32"
-		  PREFIX="-DPREFIX"
-                  ;;
-          esac
-
-          AS=nasm
-          AFLAGS="-I\$(<D)/ -f $NASM_FORMAT $PREFIX"
-          ASSEMBLY_EXTENSION="asm"
-          ASSEMBLY_SOURCES="SRC_IA32"
+   dnl if yasm hasn't been found, then check for nasm (not buggy version)
+   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
+           dnl Checking nasm patch version
+           dnl
+           AC_MSG_CHECKING([for nasm patch version])
+           nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
+           if test -z $nasm_patch ; then
+              nasm_patch=-1
+           fi
+           AC_MSG_RESULT([$nasm_patch])
+
+
+           if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then
+               AC_MSG_WARN([nasm patch version is too old])
+           else
+               found_nasm_comp_prog="yes"
+		       chosen_asm_prog="$nasm_prog"
+           fi
        fi
-
-   else
-	AC_MSG_WARN([nasm not found - Compiling generic sources only])
-	ARCHITECTURE="GENERIC"
    fi
 
+   dnl
+   dnl Ok now sort what object format we must use
+   dnl
+   if test "$found_nasm_comp_prog" = "yes" ; then
+       AC_MSG_CHECKING([for asm object format])
+       case "$target_os" in
+           *bsd*|linux*|beos|irix*|solaris*)
+               AC_MSG_RESULT([elf])
+               NASM_FORMAT="elf"
+	       MARK_FUNCS="-DMARK_FUNCS"
+	           PREFIX=""
+               ;;
+           [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
+               AC_MSG_RESULT([win32])
+               NASM_FORMAT="win32"
+	       PREFIX="-DPREFIX"
+	       MARK_FUNCS=""
+               ;;
+       esac
+
+       AS="$chosen_asm_prog"
+       ASSEMBLY_EXTENSION="asm"
+       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"
+   fi
 fi
 
 dnl