Fix configuration bug on Solaris 2.5.1.

* configure.ac: Fix a bug in shell pattern matching that caused
'configure' to treat Solaris 2.5.1 as if it were Solaris 10 or later.

Fixes: debbugs:16896

2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b071411f15..ed49b2c5e45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix configuration bug on Solaris 2.5.1 (Bug#16896).
+        * configure.ac: Fix a bug in shell pattern matching that caused
+        'configure' to treat Solaris 2.5.1 as if it were Solaris 10 or later.
+
 2014-02-25  Paul Eggert  <eggert@penguin.cs.ucla.edu>
 
         Merge from gnulib (Bug#16825).
diff --git a/configure.ac b/configure.ac
index 6a31fcb1b2b..f2a2186403c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -575,6 +575,10 @@ case "${canonical}" in
       * )               unported=yes ;;
     esac
     case "${canonical}" in
+      *-sunos5.[1-9][0-9]* | *-solaris2.[1-9][0-9]* )
+                opsys=sol2-10
+                emacs_check_sunpro_c=yes
+                ;;
       *-sunos5.6* | *-solaris2.6* )
                 opsys=sol2-6
                 RANLIB="ar -ts"
@@ -583,10 +587,6 @@ case "${canonical}" in
                 opsys=sol2-6
                 emacs_check_sunpro_c=yes
                 ;;
-      *-sunos5* | *-solaris* )
-                opsys=sol2-10
-                emacs_check_sunpro_c=yes
-                ;;
     esac
     ## Watch out for a compiler that we know will not work.
     case "${canonical}" in