3 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f78606d7367..63ec131c45b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * configure.in (xtensa): Match more configurations.
+
+        * configure: Regenerate.
+
 2008-01-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * config.guess, config.sub: Updated from master source.
diff --git a/configure b/configure
index 859f6b74881..c262d134757 100755
--- a/configure
+++ b/configure
@@ -412,10 +412,10 @@ else
 fi
 
 test \$exitcode = 0") || {
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf@gnu.org about your system,
+  echo including any error possibly output before this
+  echo message
 }
 
 
@@ -3174,7 +3174,7 @@ _ACEOF
   ;;
 
   ## Tensilica Xtensa Linux-based GNU system
-  xtensa-*-linux-gnu* )
+  xtensa*-*-linux-* )
     machine=xtensa opsys=gnu-linux
     ;;
 
diff --git a/configure.in b/configure.in
index 2320ea18370..fc2a624487d 100644
--- a/configure.in
+++ b/configure.in
@@ -1209,7 +1209,7 @@ dnl see the `changequote' comment above.
   ;;
 
   ## Tensilica Xtensa Linux-based GNU system    
-  xtensa-*-linux-gnu* )
+  xtensa*-*-linux-* )
     machine=xtensa opsys=gnu-linux
     ;;