diff --git a/ChangeLog b/ChangeLog
index 3a1b7c21f3a0..33287616b62d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-13  Anthony Green  <green@redhat.com>
+	
+	* configure.in: Disable libgcj for any target not specifically
+ 	listed.  Disable libgcj for x86 and Alpha Linux until compatible
+ 	with g++ abi.
+ 
 2000-12-13  Mike Stump  <mrs@wrs.com>
 
 	* Makefile.in (local-distclean): Also remove fastjar.
diff --git a/configure.in b/configure.in
index cf3d57b66908..20848893fc02 100644
--- a/configure.in
+++ b/configure.in
@@ -606,7 +606,7 @@ case "${target}" in
     ;;
   alpha*-*-linux*)
     # newlib is not 64 bit ready
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
     # linux has rx in libc
     skipdirs="$skipdirs target-librx"
     ;;
@@ -742,10 +742,6 @@ case "${target}" in
     # but don't build gdb
     noconfigdirs="$noconfigdirs gdb target-libg++ ${libstdcxx_version} target-librx ${libgcj}"
     ;;
-  i[3456]86-*-linux*)
-    # linux has rx in libc
-    skipdirs="$skipdirs target-librx"
-    ;;
   *-*-linux*)
     noconfigdirs="${libgcj}"
     # linux has rx in libc
@@ -959,6 +955,9 @@ case "${target}" in
     configdirs="$configdirs grez"
     noconfigdirs="${libgcj}"
     ;;    
+  *-*-*)
+    noconfigdirs="${libgcj}"
+    ;;
 esac
 
 # If we aren't building newlib, then don't build libgloss, since libgloss