--- trunk/xvidcore/build/generic/configure.in	2010/06/07 07:04:00	1889
+++ trunk/xvidcore/build/generic/configure.in	2011/01/06 14:08:06	1941
@@ -8,12 +8,12 @@
 
 AC_PREREQ([2.50])
 
-AC_INIT([Xvid], [1.3.0], [xvid-devel@xvid.org])
+AC_INIT([Xvid], [1.4.0], [xvid-devel@xvid.org])
 AC_CONFIG_SRCDIR(configure.in)
 
 dnl Do not forget to increase that when needed.
 API_MAJOR="4"
-API_MINOR="3"
+API_MINOR="4"
 
 dnl NASM/YASM version requirement
 minimum_yasm_major_version=1
@@ -428,8 +428,13 @@
 	       MARK_FUNCS=""
                ;;
            *darwin*)
-               AC_MSG_RESULT([macho])
-               NASM_FORMAT="macho"
+               if test "$ARCHITECTURE" = "X86_64" ; then
+                   AC_MSG_RESULT([macho64])
+                   NASM_FORMAT="macho64"
+               else
+                   AC_MSG_RESULT([macho32])
+                   NASM_FORMAT="macho32"
+               fi
                PREFIX="-DPREFIX"
                MARK_FUNCS=""
                ;;