Remove some old cruft variables from configure.

3 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 426420404c..952a8443df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-10  Roland McGrath  <roland@hack.frob.com>
+
+	* configure.in (sysnames): Drop use of $m0sub and $msub, which are
+	never set.
+	* configure: Regenerated.
+
 2013-01-10  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/sparc32/sparcv9/mul_1.S: Properly optimize for 32-bit
diff --git a/configure b/configure
index 8799b7de78..bdca5b3958 100755
--- a/configure
+++ b/configure
@@ -4354,12 +4354,13 @@ for b in $base ''; do
 	for m in $multi_arch_d $mach ''; do
 	  for d in $add_ons_pfx ''; do
 	    for a in $add_ons_sfx ''; do
-	      if test -n "$m0$m0sub$b$v$o$m$msub"; then
+	      try_suffix="$m0$b$v$o$m"
+	      if test -n "$try_suffix"; then
 		try_srcdir="${srcdir}/"
 		case "$d" in
 		/*) try_srcdir= ;;
 		esac
-		try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
+		try="${d}sysdeps$try_suffix$a"
 		test -n "$enable_debug_configure" &&
 		echo "$0 DEBUG: try $try" >&2
 		if test -d "$try_srcdir$try"; then
diff --git a/configure.in b/configure.in
index d369382264..96da720426 100644
--- a/configure.in
+++ b/configure.in
@@ -702,12 +702,13 @@ for b in $base ''; do
 	for m in $multi_arch_d $mach ''; do
 	  for d in $add_ons_pfx ''; do
 	    for a in $add_ons_sfx ''; do
-	      if test -n "$m0$m0sub$b$v$o$m$msub"; then
+	      try_suffix="$m0$b$v$o$m"
+	      if test -n "$try_suffix"; then
 		try_srcdir="${srcdir}/"
 		case "$d" in
 		/*) try_srcdir= ;;
 		esac
-		try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
+		try="${d}sysdeps$try_suffix$a"
 		test -n "$enable_debug_configure" &&
 		echo "$0 [DEBUG]: try $try" >&2
 		if test -d "$try_srcdir$try"; then