--- rpl/configure.ac	2012/05/29 13:34:17	1.32
+++ rpl/configure.ac	2012/05/30 12:24:25	1.33
@@ -29,32 +29,20 @@ COCOA=CoCoALib-0.9950
 PARI=pari-2.5.1
 GIAC=giac-0.9.6
 
+dnl 32 bits ABI
+AC_ARG_WITH(gcc_version,
+[  --with-gcc-version      force gcc version],[
+CC=gcc-$with_gcc_version
+CXX=g++-$with_gcc_version
+CF=gfortran-$with_gcc_version
+F77=gfortran-$with_gcc_version
+],[])
+
 dnl Checks for C compiler
 AC_PROG_CC(gcc)
 
 EXT_SQL=
 
-if test x"$CC" != x""; then
-	GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
-			awk -F. '{ printf("%s", $1);}'`
-	GCC_VERSION_MINEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
-			awk -F. '{ printf("%s", $2);}'`
-	if test $GCC_VERSION_MAJEURE -ge 5; then
-		OPTIMISATION_C=-O3
-	else
-		if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; \
-				then
-			OPTIMISATION_C=-O3
-		else
-			if test $GCC_VERSION_MAJEURE -ge 2; then
-				OPTIMISATION_C=-O2
-			else
-				AC_MSG_ERROR([Cannot find decent or recent gcc (gcc-4.2 or better)!])
-			fi
-		fi
-	fi
-fi
-
 AM_PROG_CC_C_O
 
 if test "$GCC" != yes; then
@@ -68,26 +56,6 @@ if test "$GXX" != yes; then
 	AC_MSG_ERROR([Cannot find g++! You have to install it.])
 fi
 
-if test x"$CXX" != x""; then
-	GCC_VERSION_MAJEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \
-			awk -F. '{ printf("%s", $1);}'`
-	GCC_VERSION_MINEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \
-			awk -F. '{ printf("%s", $2);}'`
-	if test $GCC_VERSION_MAJEURE -ge 5; then
-		OPTIMISATION_GXX=-O3
-	else
-		if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then
-			OPTIMISATION_GXX=-O3
-		else
-			if test $GCC_VERSION_MAJEURE -ge 3; then
-				OPTIMISATION_GXX=-O2
-			else
-				AC_MSG_ERROR([Cannot find decent or recent g++ (g++-4.3 or better)!])
-			fi
-		fi
-	fi
-fi
-
 dnl Checks for Fortran 77 compiler
 AC_PROG_F77(gfortran)
 
@@ -102,25 +70,9 @@ if test x"$FC" == x; then
 	AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
 fi
 
-if test x"$FC" != x""; then
-	GCC_VERSION_MAJEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
-			awk -F. '{ printf("%s", $1);}'`
-	GCC_VERSION_MINEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
-			awk -F. '{ printf("%s", $2);}'`
-	if test $GCC_VERSION_MAJEURE -ge 5; then
-		OPTIMISATION_F=-O3
-	else
-		if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then
-			OPTIMISATION_F=-O3
-		else
-			if test $GCC_VERSION_MAJEURE -ge 3; then
-				OPTIMISATION_F=-O2
-			else
-				AC_MSG_ERROR([Cannot find decent or recent gfortran (gfortran-4.3 or better)!])
-			fi
-		fi
-	fi
-fi
+OPTIMISATION_C=-O3
+OPTIMISATION_CXX=-O3
+OPTIMISATION_F=-O3
 
 dnl X paths
 AC_PATH_X
@@ -1312,11 +1264,11 @@ case $OS in
 esac
 
 case $HOST in
-	x86_64-unknown-linux-gnu)
+	x86_64-*-linux-gnu)
 		ARCH=amd64
 	break ;;
 
-	i?86-unknown-linux-gnu)
+	i?86-*-linux-gnu)
 		ARCH=i386
 	break ;;