--- trunk/xvidcore/build/generic/configure.in	2003/02/09 23:08:56	827
+++ trunk/xvidcore/build/generic/configure.in	2006/03/05 04:01:07	1694
@@ -2,41 +2,38 @@
 dnl
 dnl Autoconf script for XviD
 dnl
-dnl Copyright(C) 2003 Edouard Gomez <ed.gomez@free.fr>
+dnl Copyright(C) 2003-2004 Edouard Gomez <ed.gomez@free.fr>
 dnl
 dnl ==========================================================================
 
-AC_INIT([XviD], [0.9.1 (wip)], [xvid-devel@xvid.org])
+AC_PREREQ([2.50])
+
+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="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"
 our_cflags_defaults="$our_cflags_defaults -O2"
-our_cflags_defaults="$our_cflags_defaults -fPIC"
-our_cflags_defaults="$our_cflags_defaults -fomit-frame-pointer"
+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 -funroll-loops"
-our_cflags_defaults="$our_cflags_defaults -fschedule-insns"
-our_cflags_defaults="$our_cflags_defaults -fschedule-insns2"
+our_cflags_defaults="$our_cflags_defaults -fomit-frame-pointer"
 
 dnl ==========================================================================
 dnl Features - configure options
 dnl ==========================================================================
 
 FEATURES=""
-DIVX4COMPAT_SOURCES=""
-
-dnl BIGLUT aka old VLC code
-AC_ARG_ENABLE(oldvlc,
-		AC_HELP_STRING([--enable-oldvlc],
-				 [Enable old VLC code (Needs much more memory ~10MB)]),
-		[if test "$enable_oldvlc" = "yes" ; then
-		    FEATURES="$FEATURES -DBIGLUT"
-		 fi])
 
 dnl Internal Debug
 AC_ARG_ENABLE(idebug,
@@ -54,6 +51,15 @@
 		     FEATURES="$FEATURES -D_PROFILING_"
 		  fi])
 
+dnl GNU Profiling options
+AC_ARG_ENABLE(gnuprofile,
+		AC_HELP_STRING([--enable-gnuprofile],
+				 [Enable profiling informations for gprof]),
+		 [if test "$enable_gnuprofile" = "yes" ; then
+		     GNU_PROF_CFLAGS="-pg -fprofile-arcs -ftest-coverage"
+		     GNU_PROF_LDFLAGS="-pg"
+		  fi])
+
 dnl Assembly code
 AC_ARG_ENABLE(assembly,
 		AC_HELP_STRING([--disable-assembly],
@@ -67,14 +73,16 @@
 		  fi],
 		 [assembly="yes"])
 
-dnl Internal Debug
-AC_ARG_ENABLE(divx4compat,
-		AC_HELP_STRING([--enable-divx4compat],
-				 [Enable DivX4 compatibility API]),
-		 [if test "$enable_divx4compat" = "yes" ; then
-		     DIVX4COMPAT_SOURCES="SRC_DIVX4COMPAT"
-		  fi])
-
+dnl Build as a module not a shared lib on darwin
+AC_ARG_ENABLE(macosx_module,
+		AC_HELP_STRING([--enable-macosx_module],
+				 [Build as a module on MacOS X]),
+		 [if test "$enable_macosx_module" = "yes" ; then
+		     macosx_module="yes"
+		  else 
+		     macosx_module="no"
+		  fi],
+		  [macosx_module="no"])
 
 dnl ==========================================================================
 dnl Default install prefix and checks build type
@@ -99,7 +107,6 @@
 AC_MSG_CHECKING(whether to use default CFLAGS)
 if test  x"$CFLAGS" = x"" ; then
    force_default_cc_options="yes"
-   CFLAGS="$our_cflags_defaults"
    AC_MSG_RESULT([yes])
 else
    force_default_cc_options="no"
@@ -116,6 +123,12 @@
 AC_PROG_INSTALL
 
 dnl ==========================================================================
+dnl Check for the ranlib program to generate static library index
+dnl ==========================================================================
+
+AC_PROG_RANLIB
+
+dnl ==========================================================================
 dnl
 dnl This part looks for:
 dnl
@@ -149,12 +162,14 @@
 	  i[[3456]]86)
 	  AC_MSG_RESULT(ia32)
 	  	ARCHITECTURE="IA32"
+                ;;
+          x86_64)
+                AC_MSG_RESULT(x86_64)
+                ARCHITECTURE="X86_64"
 		;;	
 		powerpc)
 		AC_MSG_RESULT(PowerPC)
-		dnl ATM the ppc port is out of date 
-		dnl ARCHITECTURE="PPC"
-		ARCHITECTURE="GENERIC"
+		ARCHITECTURE="PPC"
 		;;
 		ia64)
 		AC_MSG_RESULT(ia64)
@@ -213,16 +228,21 @@
 	SHARED_EXTENSION="so"
 	OBJECT_EXTENSION="o"
 	;;
-     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks)
-	AC_MSG_RESULT([.dll .lib .obj])
-	STATIC_EXTENSION="lib"
+     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
+	AC_MSG_RESULT([.dll .a .obj])
+	STATIC_EXTENSION="a"
 	SHARED_EXTENSION="dll"
 	OBJECT_EXTENSION="obj"
 	;;
      darwin*|raphsody*)
-	AC_MSG_RESULT([.dynlib .a .o])
+	if test x"$macosx_module" = x"yes"; then
+	   AC_MSG_RESULT([.so .a .o])
+	   SHARED_EXTENSION="so"
+        else
+	   AC_MSG_RESULT([.dynlib .a .o])
+	   SHARED_EXTENSION="dylib"
+	fi
 	STATIC_EXTENSION="a"
-	SHARED_EXTENSION="dylib"
 	OBJECT_EXTENSION="o"
 	;;
      *)
@@ -233,36 +253,77 @@
 	;;
 esac
 
+dnl ==========================================================================
+dnl
+dnl Determines best options for CC and LD
+dnl  - STATIC_LIB, SHARED_LIB, SPECIFIC_CFLAGS, SPECIFIC_LDLAGS
+dnl
+dnl ==========================================================================
+
 AC_MSG_CHECKING(for platform specific LDFLAGS/CFLAGS)
-OS_LDFLAGS=""
+SPECIFIC_LDFLAGS=""
+SPECIFIC_CFLAGS=""
+PRE_SHARED_LIB=""
 case "$target_os" in
-     *bsd*|linux*|irix*|solaris*)
-	AC_MSG_RESULT([-shared -lc -lm])
-	OS_LDFLAGS="-shared -lc -lm"
-	;;
-     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]|mingw32|mks)
-	AC_MSG_RESULT([-shared -Wl,--dll,--out-implib,\$@.a])
-	OS_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
-	CFLAGS="$CFLAGS -mno-cygwin"
+     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)"
+	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
+	SPECIFIC_CFLAGS="-fPIC"
+	;;
+     [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
+	AC_MSG_RESULT([ok])
+	STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
+	SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
+	SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
+	SPECIFIC_CFLAGS="-mno-cygwin"
 	;;
      darwin*|raphsody*)
-	AC_MSG_RESULT([-dynamiclib])
-	OS_LDFLAGS="-dynamiclib"
-	CFLAGS="$CFLAGS -fno-common"
+	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+	SPECIFIC_CFLAGS="-fPIC -fno-common -no-cpp-precomp"
+	if test x"$macosx_module" = x"no"; then
+	   AC_MSG_RESULT([dylib options])
+	   SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"
+	   SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
+	else 
+	   AC_MSG_RESULT([module options])
+ 	   PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
+	   SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
+	   SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress"
+	fi
 	;;
      beos)
-	AC_MSG_RESULT([-nostart])
-	OS_LDFLAGS="-nostart"
+	AC_MSG_RESULT([ok])
+	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
+	SPECIFIC_LDFLAGS="-nostart"
+	SPECIFIC_CFLAGS="-fPIC"
 	;;
      *)
-        AC_MSG_RESULT([Unknown OS - -shared -lc -lm])
-	OS_LDFLAGS=""
+        AC_MSG_RESULT([Unknown Platform (Using default -shared -lc -lm)])
+    STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
+	SPECIFIC_LDFLAGS=""
+	SPECIFIC_CFLAGS=""
 	;;
 esac
 
+if test x"$PRE_SHARED_LIB" = x; then 
+  PRE_SHARED_LIB=$SHARED_LIB
+fi
+
 dnl ==========================================================================
 dnl
-dnl Assembler stuff - AS, AFLAGS, ASSEMBLY_EXTENSION, SOURCES
+dnl Assembler stuff
+dnl  - AS, AFLAGS, ASSEMBLY_EXTENSION, SOURCES
 dnl
 dnl ==========================================================================
 
@@ -276,77 +337,167 @@
 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`
-      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
 dnl PPC
 dnl
-
+dnl With the PPC platform we do not use assembly language, we better keep with
+dnl intrinsic altivec functions and types as they are supported by both Apple
+dnl and GNU gcc with very slight changes to code which can be sumed up by:
+dnl
+dnl Apple:
+dnl  - compile with the option -faltivec
+dnl  - define vectors with parentheses vec = (0,0,0,0)
+dnl GNU
+dnl  - compile with -maltivec -mabi=altivec
+dnl  - include <altivec.h> before using intrincic
+dnl  - define vectors with vec = {0,0,0,0}
+dnl
+dnl * The compile time option will be "injected" into SPECIFIC_CFLAGS variable
+dnl * The need for altivec.h will also be injected into SPECIFIC_CFLAGS through
+dnl   a -DHAVE_ALTIVEC_H
+dnl * The vector definition is handled in portab.h thx to
+dnl   HAVE_PARENTHESES/BRACES_ALTIVEC_DECL
+dnl
+PPC_ALTIVEC_SOURCES=""
 if test "$ARCHITECTURE" = "PPC" ; then
    AS="\$(CC)"
-   AFLAGS="-c"
-   ASSEMBLY_EXTENSION="s"
-   ASSEMBLY_SOURCES="SRC_PPC"
-   AC_MSG_CHECKING([for Altivec support])
-   cat > conftest.S << EOF
-         .text
-         vxor 0,0,0
+   AFLAGS=""
+   ASSEMBLY_EXTENSION=".s"
+   ASSEMBLY_SOURCES=""
+
+   AC_MSG_CHECKING([for altivec.h])
+cat > conftest.c << EOF
+#include <altivec.h>
+int main() { return(0); }
 EOF
-   if $CC -c conftest.S 2>/dev/null 1>/dev/null ; then
+   if $CC -faltivec -c conftest.c 2>/dev/null 1>/dev/null || \
+      $CC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
         AC_MSG_RESULT(yes)
-        CFLAGS="$CFLAGS -DARCH_IS_PPC_ALTIVEC"
-        ASSEMBLY_SOURCES="SRC_ALTIVEC"
+        SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_H"
+	TEMP_ALTIVEC="-DHAVE_ALTIVEC_H"
    else
         AC_MSG_RESULT(no)
+	TEMP_ALTIVEC=""
+   fi
+
+   AC_MSG_CHECKING([for Altivec compiler support])
+cat > conftest.c << EOF
+#ifdef HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
+
+int main()
+{
+  vector unsigned int vartest2 = (vector unsigned int)(0);
+  vector unsigned int vartest3 = (vector unsigned int)(1);
+  vartest2 = vec_add(vartest2, vartest3);
+  return(0);
+}
+EOF
+   if $CC $TEMP_ALTIVEC -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then
+        AC_MSG_RESULT([yes (Apple)])
+        SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC"
+	PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
+   else
+cat > conftest.c << EOF
+#ifdef HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
+
+int main()
+{
+  vector unsigned int vartest2 = (vector unsigned int){0};
+  vector unsigned int vartest3 = (vector unsigned int){1};
+  vartest2 = vec_add(vartest2, vartest3);
+  return(0);
+}
+EOF
+   if $CC $TEMP_ALTIVEC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then
+        AC_MSG_RESULT([yes (GNU)])
+        SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_BRACES_DECL $TEMP_ALTIVEC"
+	PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC"
+   else
+	AC_MSG_RESULT([no (ppc support won't be compiled in)])
+	dnl Only C code can be compiled :-(
+	ARCHITECTURE="GENERIC"
    fi
+   fi
+
    rm -f conftest.*
 fi
 
@@ -359,6 +510,22 @@
    AFLAGS="-c"
    ASSEMBLY_EXTENSION="s"
    ASSEMBLY_SOURCES="SRC_IA64"
+
+   case `basename $CC` in
+	*ecc*)
+		DCT_IA64_SOURCES="SRC_IA64_IDCT_ECC"
+
+		dnl If the compiler is ecc, then i don't know its options
+		dnl fallback to "no options"
+		if test "$force_default_cc_options" = "yes" ; then
+		   our_cflags_defaults=""
+		fi
+		;;
+	*)
+		DCT_IA64_SOURCES="SRC_IA64_IDCT_GCC"
+		;;
+   esac
+
 fi
 
 dnl ==========================================================================
@@ -370,10 +537,101 @@
 AC_CHECK_HEADERS(
 	stdio.h \
 	signal.h \
+	stdlib.h \
+	string.h \
+	assert.h \
+	math.h \
 	, , AC_MSG_ERROR(Missing header file))
 
 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 ==========================================================================
+
+if test "$force_default_cc_options" = "yes" ; then
+   CFLAGS="$our_cflags_defaults"
+fi
+
+dnl ==========================================================================
+dnl
+dnl Profiling stuff goes here
+dnl  - adds options to SPECIFIC_CFLAGS, SPECIFIC_LDLAGS
+dnl  - removes incompatible options from CFLAGS
+dnl
+dnl ==========================================================================
+
+SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS $GNU_PROF_LDFLAGS"
+SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS $GNU_PROF_CFLAGS"
+
+if test "$enable_gnuprofile" = "yes" ; then
+   CFLAGS=`echo $CFLAGS | sed s/'-fomit-frame-pointer'/''/`
+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
 dnl ==========================================================================
@@ -393,8 +651,16 @@
 AC_SUBST(ASSEMBLY_SOURCES)
 AC_SUBST(CC)
 AC_SUBST(CFLAGS)
-AC_SUBST(OS_LDFLAGS)
-AC_SUBST(DIVX4COMPAT_SOURCES)
+AC_SUBST(SPECIFIC_LDFLAGS)
+AC_SUBST(SPECIFIC_CFLAGS)
+AC_SUBST(DCT_IA64_SOURCES)
+AC_SUBST(PPC_ALTIVEC_SOURCES)
+AC_SUBST(RANLIB)
+AC_SUBST(API_MAJOR)
+AC_SUBST(API_MINOR)
+AC_SUBST(STATIC_LIB)
+AC_SUBST(PRE_SHARED_LIB)
+AC_SUBST(SHARED_LIB)
 
 dnl ==========================================================================
 dnl