configure change to handle Implies-{before,after} files

ChangeLog

@@ -1,3 +1,9 @@
+2012-05-15  Roland McGrath  <roland@hack.frob.com>
+
+	* configure.in (sysnames): Look for Implies-before and Implies-after
+	files.
+	* configure: Regenerated.
+
 2012-05-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/sigaction.c (RESTORE2): Replace

configure

@@ -4324,42 +4324,43 @@ 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-before Implies-after; do
-    # Collect more names from the `Implies' file (removing comments).
+    implies_type=`echo $implies_file | sed s/-/_/`
-    implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/Implies`"
+    eval ${implies_type}=
-    implied=
+    if test -f $xsrcdir$name/$implies_file; then
-    for x in $implied_candidate; do
+      # Collect more names from the `Implies' file (removing comments).
-      found=no
+      implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/$implies_file`"
-      if test -d $xsrcdir$name_base/$x; then
+      for x in $implied_candidate; do
-	implied="$implied $name_base/$x";
+	found=no
-	found=yes
+	if test -d $xsrcdir$name_base/$x; then
-      fi
+	  eval "${implies_type}=\"\$${implies_type} \$name_base/\$x\""
-      for d in $add_ons_pfx ''; do
-	try="${d}sysdeps/$x"
-	case $d in
-	 /*) try_srcdir= ;;
-	 *) try_srcdir=$srcdir/ ;;
-	esac
-	test -n "$enable_debug_configure" &&
-	 echo "DEBUG: $name implied $x try($d) {$try_srcdir}$try" >&2
-	if test $try != $xsrcdir$name_base/$x && test -d $try_srcdir$try;
-	then
-	  implied="$implied $try"
 	  found=yes
-	  case "$sysnames_add_ons" in
+	fi
-	  *" $d "*) ;;
+	for d in $add_ons_pfx ''; do
-	  *|'') sysnames_add_ons="$sysnames_add_ons $d" ;;
+	  try="${d}sysdeps/$x"
+	  case $d in
+	   /*) try_srcdir= ;;
+	   *) try_srcdir=$srcdir/ ;;
 	  esac
+	  test -n "$enable_debug_configure" &&
+	   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
+	    eval "${implies_type}=\"\$${implies_type} \$try\""
+	    found=yes
+	    case "$sysnames_add_ons" in
+	    *" $d "*) ;;
+	    *|'') sysnames_add_ons="$sysnames_add_ons $d" ;;
+	    esac
+	  fi
+	done
+	if test $found = no; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $name/$implies_file specifies nonexistent $x" >&5
+$as_echo "$as_me: WARNING: $name/$implies_file specifies nonexistent $x" >&2;}
 	fi
       done
-      if test $found = no; then
+    fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $name/Implies specifies nonexistent $x" >&5
+  done
-$as_echo "$as_me: WARNING: $name/Implies specifies nonexistent $x" >&2;}
-      fi
-    done
-  else
-    implied=
-  fi
 
   # Add NAME to the list of names.
   names="$names $name"
@@ -4367,6 +4368,10 @@ $as_echo "$as_me: WARNING: $name/Implies specifies nonexistent $x" >&2;}
   # Find the parent of NAME, using the empty string if it has none.
   parent="`echo $name | sed -n -e 's=/[^/]*$==' -e '/sysdeps$/q' -e p`"
 
+  test -n "$enable_debug_configure" &&
+    echo "DEBUG: $name Implies='$Implies' rest='$*' parent='$parent' \
+Implies_before='$Implies_after' Implies_after='$Implies_after'" >&2
+
   # Add the names implied by NAME, and NAME's parent (if it has one), to
   # the list of names to be processed (the argument list).  We prepend the
   # implied names to the list and append the parent.  We want implied
@@ -4374,7 +4379,7 @@ $as_echo "$as_me: WARNING: $name/Implies specifies nonexistent $x" >&2;}
   # 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 $* $Implies_before $parent $Implies_after`"
   test -n "$sysnames" && set $sysnames
 done
 

configure.in

@@ -761,41 +761,42 @@ 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-before Implies-after; do
-    # Collect more names from the `Implies' file (removing comments).
+    implies_type=`echo $implies_file | sed s/-/_/`
-    implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/Implies`"
+    eval ${implies_type}=
-    implied=
+    if test -f $xsrcdir$name/$implies_file; then
-    for x in $implied_candidate; do
+      # Collect more names from the `Implies' file (removing comments).
-      found=no
+      implied_candidate="`sed 's/#.*$//' < $xsrcdir$name/$implies_file`"
-      if test -d $xsrcdir$name_base/$x; then
+      for x in $implied_candidate; do
-	implied="$implied $name_base/$x";
+	found=no
-	found=yes
+	if test -d $xsrcdir$name_base/$x; then
-      fi
+	  eval "${implies_type}=\"\$${implies_type} \$name_base/\$x\""
-      for d in $add_ons_pfx ''; do
-	try="${d}sysdeps/$x"
-	case $d in
-	 /*) try_srcdir= ;;
-	 *) try_srcdir=$srcdir/ ;;
-	esac
-	test -n "$enable_debug_configure" &&
-	 echo "[DEBUG]: $name implied $x try($d) {$try_srcdir}$try" >&2
-	if test $try != $xsrcdir$name_base/$x && test -d $try_srcdir$try;
-	then
-	  implied="$implied $try"
 	  found=yes
-	  case "$sysnames_add_ons" in
+	fi
-	  *" $d "*) ;;
+	for d in $add_ons_pfx ''; do
-	  *|'') sysnames_add_ons="$sysnames_add_ons $d" ;;
+	  try="${d}sysdeps/$x"
+	  case $d in
+	   /*) try_srcdir= ;;
+	   *) try_srcdir=$srcdir/ ;;
 	  esac
+	  test -n "$enable_debug_configure" &&
+	   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
+	    eval "${implies_type}=\"\$${implies_type} \$try\""
+	    found=yes
+	    case "$sysnames_add_ons" in
+	    *" $d "*) ;;
+	    *|'') sysnames_add_ons="$sysnames_add_ons $d" ;;
+	    esac
+	  fi
+	done
+	if test $found = no; then
+	  AC_MSG_WARN($name/$implies_file specifies nonexistent $x)
 	fi
       done
-      if test $found = no; then
+    fi
-	AC_MSG_WARN($name/Implies specifies nonexistent $x)
+  done
-      fi
-    done
-  else
-    implied=
-  fi
 
   # Add NAME to the list of names.
   names="$names $name"
@@ -805,6 +806,10 @@ changequote(,)dnl
   parent="`echo $name | sed -n -e 's=/[^/]*$==' -e '/sysdeps$/q' -e p`"
 changequote([,])dnl
 
+  test -n "$enable_debug_configure" &&
+    echo "[DEBUG]: $name Implies='$Implies' rest='$*' parent='$parent' \
+Implies_before='$Implies_after' Implies_after='$Implies_after'" >&2
+
   # Add the names implied by NAME, and NAME's parent (if it has one), to
   # the list of names to be processed (the argument list).  We prepend the
   # implied names to the list and append the parent.  We want implied
@@ -812,7 +817,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 $* $Implies_before $parent $Implies_after`"
   test -n "$sysnames" && set $sysnames
 done