--- trunk/xvidcore/build/generic/configure.in	2005/01/16 10:34:52	1596
+++ trunk/xvidcore/build/generic/configure.in	2005/05/23 09:29:43	1617
@@ -8,7 +8,7 @@
 
 AC_PREREQ([2.50])
 
-AC_INIT([XviD], [1.1.0-beta1], [xvid-devel@xvid.org])
+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.
@@ -265,7 +265,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)"
@@ -562,6 +569,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