--- trunk/xvidcore/build/generic/configure.in	2010/12/31 11:39:06	1938
+++ trunk/xvidcore/build/generic/configure.in	2011/02/25 13:10:18	1957
@@ -128,6 +128,7 @@
 dnl ==========================================================================
 
 AC_PROG_RANLIB
+AC_CHECK_TOOL([AR], [ar], [ar-not-found])
 
 dnl ==========================================================================
 dnl
@@ -428,8 +429,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=""
                ;;
@@ -587,13 +593,13 @@
 dnl ==========================================================================
 
 AC_CHECK_HEADER(
-	pthread.h,
-	AC_CHECK_LIB(
-		pthread,
-		pthread_create,
-		SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
-		SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",
-		AC_MSG_WARN(Pthread not supported. No SMP support)),
+	[pthread.h],
+	[AC_CHECK_LIB(
+		[pthread],
+		[pthread_create],
+		[SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
+		 SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"],
+		AC_MSG_WARN(Pthread not supported. No SMP support))],
 	AC_MSG_WARN(Pthread not supported. No SMP support))
 
 dnl ==========================================================================
@@ -689,6 +695,7 @@
 AC_SUBST(DCT_IA64_SOURCES)
 AC_SUBST(PPC_ALTIVEC_SOURCES)
 AC_SUBST(RANLIB)
+AC_SUBST(AR)
 AC_SUBST(API_MAJOR)
 AC_SUBST(API_MINOR)
 AC_SUBST(STATIC_LIB)