Re: PATCH: Move sysdeps/x86_64/Implies to sysdeps/x86_64/64

[Roland McGrath <roland at hack dot frob dot com>]

> On Thu, Mar 22, 2012 at 2:06 PM, Roland McGrath <roland@hack.frob.com> wrote:
> >> It doesn't work. ?For x32, I got:
> >>
> >> /export/gnu/import/git/glibc-x32/configure: line 4357:
> >> /export/gnu/import/git/glibc-x32/sysdeps/x86_64/64/Implies_after: No
> >> such file or directory
> >
> > Oops. ?Change one occurrence of $implies_type to $implies_file and try again.
> >
> >
> 
> Which one?

Shockingly enough, it's the one on the line that had the error!

Here's the new patch:

diff --git a/configure.in b/configure.in
index 2363015..e0137fe 100644
--- a/configure.in
+++ b/configure.in
@@ -785,14 +785,16 @@ while test $# -gt 0; do
   test -n "$enable_debug_configure" &&
   echo "[DEBUG]: name/Implies $xsrcdir$name/Implies" >&2
 
-  if test -f $xsrcdir$name/Implies; then
+  for implies_file in Implies Implies-after; do
+    implies_type=`echo $implies_file | sed s/-/_/`
+    eval ${implies_type}=
+    if test -f $xsrcdir$name/$implies_file; then
     # Collect more names from the `Implies' file (removing comments).
-    implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/Implies`"
-    implied=
+      implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/$implies_file`"
     for x in $implied_candidate; do
       found=no
       if test -d $xsrcdir$name_base/$x; then
-	implied="$implied $name_base/$x";
+	  eval "${implies_type}=\"\$${implies_type} \$name_base/\$x\""
 	found=yes
       fi
       for d in $add_ons_pfx ''; do
@@ -802,10 +804,10 @@ while test $# -gt 0; do
 	 *) try_srcdir=$srcdir/ ;;
 	esac
 	test -n "$enable_debug_configure" &&
-	 echo "[DEBUG]: $name implied $x try($d) {$try_srcdir}$try" >&2
+	   echo "[DEBUG]: $name $implies_file $x try($d) {$try_srcdir}$try" >&2
 	if test $try != $xsrcdir$name_base/$x && test -d $try_srcdir$try;
 	then
-	  implied="$implied $try"
+	    eval "${implies_type}=\"\$${implies_type} \$try\""
 	  found=yes
 	  case "$sysnames_add_ons" in
 	  *" $d "*) ;;
@@ -814,12 +816,11 @@ while test $# -gt 0; do
 	fi
       done
       if test $found = no; then
-	AC_MSG_WARN($name/Implies specifies nonexistent $x)
+	  AC_MSG_WARN($name/$implies_file specifies nonexistent $x)
       fi
     done
-  else
-    implied=
   fi
+  done
 
   # Add NAME to the list of names.
   names="$names $name"
@@ -836,7 +837,7 @@ changequote([,])dnl
   # configuration components; this ensures that for sysv4, unix/common
   # (implied by unix/sysv/sysv4) comes before unix/sysv (in ostry (here $*)
   # after sysv4).
-  sysnames="`echo $implied $* $parent`"
+  sysnames="`echo $Implies $* $parent $Implies_after`"
   test -n "$sysnames" && set $sysnames
 done