diff --git a/src/configure.in b/src/configure.in
index 64698fdb3c68adff80e34a764c8b5454b43938dc..487c00ff29bf233936d651a908aa077827cd8153 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.392 2000/08/07 11:35:52 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.393 2000/08/11 23:49:31 per Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -669,7 +669,10 @@ if test $cflags_is_set = no; then
 
 
  if test "x${GCC-}" = xyes ; then
-  WARN="-W -Wall -Wpointer-arith -Wno-unused"
+  # Do not use -Wall, since that produces a lot of warnings that are not
+  # really interresting (such as the warning for if( ... ) ... else if(
+  # ... ) .... else
+  WARN="-Wcomment -Wformat -Wimplicit-function-declaration -Wmultichar -Wswitch -Wuninitialized -Wpointer-arith -Wchar-subscripts -Wno-long-long"
 
   if test "x${with_static_linking-}" = "xyes" ; then
     AC_SYS_COMPILER_FLAG(-static,link_static,CFLAGS)
@@ -713,6 +716,20 @@ if test $cflags_is_set = no; then
        AC_SYS_COMPILER_FLAG(-mpentium,pentium,OPTIMIZE)
     ])
    ;;
+   i86pc)
+     case "`isalist 2>/dev/null`" in 
+        *pentium_pro*)
+        AC_SYS_COMPILER_FLAG(-mcpu=pentiumpro,pentiumpro,OPTIMIZE,[
+          AC_SYS_COMPILER_FLAG(-mcpu=pentium,pentium,OPTIMIZE)
+        ])
+	;;
+        *pentium*)
+         AC_SYS_COMPILER_FLAG(-mcpu=pentium,pentium,OPTIMIZE,[
+           AC_SYS_COMPILER_FLAG(-m486,486,OPTIMIZE)
+         ])
+	;;
+     esac
+    ;;
   esac
 
   # AIX