toplevel configure.in: simplify tests

toplevel configure.in: simplify tests

[Nathanael Nerode]

Simplify a number of tests, now that all subdirectories are autoconfiscated.

2002-09-21  Nathanael Nerode  <neroden@gcc.gnu.org>

	* configure.in: Simplify tests.

--- configure.in	2002-09-21 13:56:03.000000000 -0400
+++ configure.in.new	2002-09-21 13:55:47.000000000 -0400
@@ -743,8 +743,7 @@
   dirname=`echo $dir | sed -e s/target-//g`
   if test $dir != .  && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
     configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"`
-    if test -r $srcdir/$dirname/configure \
-	|| test -r $srcdir/$dirname/configure.in ; then
+    if test -r $srcdir/$dirname/configure ; then
       if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
 	true
       else
@@ -754,8 +753,7 @@
   fi
   if test $dir != . && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
     target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"`
-    if test -r $srcdir/$dirname/configure \
-	|| test -r $srcdir/$dirname/configure.in ; then
+    if test -r $srcdir/$dirname/configure ; then
       if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
 	true
       else
@@ -771,7 +769,7 @@
   others=
   for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do
     if test "$i" != "libiberty" ; then
-      if test -r $srcdir/$i/configure || test -r $srcdir/$i/configure.in ; then
+      if test -r $srcdir/$i/configure ; then
 	others=yes;
 	break;
       fi

Re: toplevel configure.in: simplify tests

[Alexandre Oliva]

On Sep 21, 2002, Nathanael Nerode <neroden@doctormoo.dyndns.org> wrote:

Welcome back! :-)

> 2002-09-21  Nathanael Nerode  <neroden@gcc.gnu.org>

> 	* configure.in: Simplify tests.

Ok.

Hmm...  I think we're in bug-fix only mode in GCC mainline, so I'd
approve this only to the gcc 3.4 small improvements branch.  But then,
this would get GCC mainline out of sync with src, so DJ might be
annoyed because his auto sync would stop working.  DJ, what do yo
think?

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Re: toplevel configure.in: simplify tests

[DJ Delorie]

> Hmm...  I think we're in bug-fix only mode in GCC mainline, so I'd
> approve this only to the gcc 3.4 small improvements branch.  But then,
> this would get GCC mainline out of sync with src, so DJ might be
> annoyed because his auto sync would stop working.  DJ, what do yo
> think?

There was a change just yesterday to gcc's toplevel files, so they're
already out of sync.  That change was described as a convenience
change, so it seems like the rules are flexible anyway.

It's three weeks until the 3.3 branch, unless it's delayed.  IMHO This
patch is harmless in the current tree, because we no longer support
cygnus-style configure anyway, so I would have no problem with it
going in.  But waiting a few weeks doesn't sound unreasonable either.