[XviD-devel] [PATCH 1/3] GCC4 support in configure.in

[Edouard Gomez]

The inlined patch adds GCC4 support in configure.in

diff -ur xvidcore-1.1.0-beta2.orig/build/generic/configure.in xvidcore-1.1.0-beta2/build/generic/configure.in
--- xvidcore-1.1.0-beta2.orig/build/generic/configure.in	2005-04-03 22:39:45.000000000 +0200
+++ xvidcore-1.1.0-beta2/build/generic/configure.in	2005-04-29 14:43:03.000000000 +0200
@@ -562,6 +562,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 && $GCC_MINOR -gt 3 ; then
+		CFLAGS=`echo $CFLAGS | sed s,"-mcpu","-mtune",g`
+	fi
+fi
+
+
+dnl ==========================================================================
 dnl
 dnl Substitions
 dnl