--- trunk/xvidcore/build/generic/configure.in	2004/05/21 14:40:15	1451
+++ branches/release-1_2-branch/xvidcore/build/generic/configure.in	2008/12/01 16:35:47	1837
@@ -1,6 +1,6 @@
 dnl ==========================================================================
 dnl
-dnl Autoconf script for XviD
+dnl Autoconf script for Xvid
 dnl
 dnl Copyright(C) 2003-2004 Edouard Gomez <ed.gomez@free.fr>
 dnl
@@ -8,15 +8,16 @@
 
 AC_PREREQ([2.50])
 
-AC_INIT([XviD], [1.0.0], [xvid-devel@xvid.org])
+AC_INIT([Xvid], [1.2.1], [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="2"
 
 dnl NASM version requirement
-minimum_nasm_patch_version=34
+minimum_nasm_minor_version=0
+minimum_nasm_major_version=2
 nasm_prog="nasm"
 
 dnl Default CFLAGS -- Big impact on overall speed
@@ -24,7 +25,6 @@
 our_cflags_defaults="$our_cflags_defaults -O2"
 our_cflags_defaults="$our_cflags_defaults -fstrength-reduce"
 our_cflags_defaults="$our_cflags_defaults -finline-functions"
-our_cflags_defaults="$our_cflags_defaults -freduce-all-givs"
 our_cflags_defaults="$our_cflags_defaults -ffast-math"
 our_cflags_defaults="$our_cflags_defaults -fomit-frame-pointer"
 
@@ -161,6 +161,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)
@@ -194,7 +198,7 @@
 	BUS="64BIT"
 	;;
      *)
-	AC_MSG_ERROR([XviD supports only 32/64 bit architectures])
+	AC_MSG_ERROR([Xvid supports only 32/64 bit architectures])
 	;;
 esac
 
@@ -260,7 +264,14 @@
 SPECIFIC_CFLAGS=""
 PRE_SHARED_LIB=""
 case "$target_os" in
-     *bsd*|linux*|irix*|solaris*)
+     linux*|solaris*)
+	AC_MSG_RESULT([ok])
+	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
+	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
+	SPECIFIC_CFLAGS="-fPIC"
+	;;
+     *bsd*|irix*)
 	AC_MSG_RESULT([ok])
 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
 	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
@@ -297,7 +308,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 +336,90 @@
 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
-   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
-         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 Check for nasm (not buggy version)
+   if test "$found_nasm_comp_prog" = "no" ; then
+       AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes])
+       if test "$ac_nasm" = "yes" ; then
+           dnl
+           dnl Checking nasm version
+           dnl
+           AC_MSG_CHECKING([for nasm version])
+           nasm_minor=`$nasm_prog -v | cut -d '.' -f 2 | cut -d ' ' -f 1`
+           nasm_major=`$nasm_prog -v | cut -d '.' -f 1 | cut -d ' ' -f 3`
+           if test -z $nasm_minor ; then
+              nasm_minor=-1
+           fi
+           if test -z $nasm_major ; then
+              nasm_major=-1
+           fi
+           AC_MSG_RESULT([$nasm_major])
+
+           dnl need nasm 2.x for SSE3/4 and X86_64
+           if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then
+             AC_MSG_WARN([nasm 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*)
+               if test "$ARCHITECTURE" = "X86_64" ; then
+                   AC_MSG_RESULT([elf64])
+                   NASM_FORMAT="elf64"
+               else
+                   AC_MSG_RESULT([elf])
+                   NASM_FORMAT="elf"
+               fi
+	       MARK_FUNCS="-DMARK_FUNCS"
+	           PREFIX=""
+               ;;
+           [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
+               if test "$ARCHITECTURE" = "X86_64" ; then
+                   AC_MSG_RESULT([win64])
+                   NASM_FORMAT="win64"
+               else
+                   AC_MSG_RESULT([win32])
+                   NASM_FORMAT="win32"
+               fi
+	       PREFIX="-DWINDOWS"
+	       MARK_FUNCS=""
+               ;;
+           *darwin*)
+               AC_MSG_RESULT([macho])
+               NASM_FORMAT="macho"
+               PREFIX="-DPREFIX"
+               MARK_FUNCS=""
+               ;;
+       esac
+
+       AS="$chosen_asm_prog"
+       ASSEMBLY_EXTENSION="asm"
+       AFLAGS="-I\$(<D)/ -I../../src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
+       ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"
+       if test "$ARCHITECTURE" = "X86_64" ; then
+               AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"
+       fi
+   else 
+       AC_MSG_WARN([no correct assembler was found - Compiling generic sources only])
+       ARCHITECTURE="GENERIC"
+   fi
 fi
 
 dnl
@@ -512,6 +555,26 @@
 
 dnl ==========================================================================
 dnl
+dnl Check for pthread
+dnl
+dnl ==========================================================================
+
+AC_CHECK_HEADER(
+	pthread.h,
+	AC_CHECK_LIB(
+		pthread,
+		pthread_create,
+		AC_CHECK_LIB(
+			pthread,
+			pthread_join,
+			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)),
+	AC_MSG_WARN(Pthread not supported. No SMP support))
+
+dnl ==========================================================================
+dnl 
 dnl Now we can set CFLAGS if needed
 dnl
 dnl ==========================================================================
@@ -536,6 +599,48 @@
 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 && test "${GCC_MINOR}" -gt 3 ; then
+		CFLAGS=`echo $CFLAGS | sed s,"-mcpu","-mtune",g`
+	fi
+fi
+
+
+dnl ==========================================================================
 dnl
 dnl Substitions
 dnl