Re: Overlapping patterns in toplevel configure.in

[Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>]

Andreas Schwab wrote:
> The toplevel congfigure.in script contains a case pattern *-*-linux* that
> overrules the pattern mips*-*-linux*.  The first pattern only exists in
> the gcc repository, not in the src repository.  There are also other linux
> cases that are not a superset of the generic *-*-linux* case.  What is the
> best way to resolve that?

What about doing the minimum needed to fix it? The patch below moves
it downwards and updates the mips case.

> Perhaps the generic linux pattern should be
> moved to a separate case statement.  But there is also a catch-all
> pattern at the end that disables libgcj for all not explicitly mentioned
> targets unless --enable-libgcj is given.  In other words, it's a big
> mess. :-(

The check about rx is always the same and could be moved in a seperate
statement.


Thiemo


--- configure.in	Thu Mar 28 00:32:31 2002
+++ configure.in.mipsfix	Tue Apr  9 11:14:24 2002
@@ -796,11 +796,6 @@ case "${target}" in
          target_configdirs="${target_configdirs} target-libstub target-cygmon"
     fi
     ;;
-  *-*-linux*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-    # linux has rx in libc
-    skipdirs="$skipdirs target-librx"
-    ;;
   i[3456]86-*-mingw32*)
     target_configdirs="$target_configdirs target-mingw"
     noconfigdirs="$noconfigdirs expect target-libgloss ${libgcj}"
@@ -951,7 +946,9 @@ case "${target}" in
     target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
    ;;
   mips*-*-linux*)
-    noconfigdirs="$noconfigdirs target-libffi"
+    noconfigdirs="$noconfigdirs target-libffi target-newlib target-libgloss"
+    # linux has rx in libc
+    skipdirs="$skipdirs target-librx"
     ;;
   mips*-*-*)
     noconfigdirs="$noconfigdirs gprof ${libgcj}"
@@ -1023,6 +1020,11 @@ case "${target}" in
     ;;
   vax-*-*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
+    ;;
+  *-*-linux*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    # linux has rx in libc
+    skipdirs="$skipdirs target-librx"
     ;;
   *-*-lynxos*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"