pull up r23144, r23145 from trunk

 ------------------------------------------------------------------------
 r23145 | raeburn | 2009-11-09 11:56:01 -0500 (Mon, 09 Nov 2009) | 4 lines

 ticket: 6579

 Revise patch to avoid using changequote.

 ------------------------------------------------------------------------
 r23144 | raeburn | 2009-11-09 01:13:34 -0500 (Mon, 09 Nov 2009) | 21 lines

 ticket: 6579
 target_version: 1.7.1
 tags: pullup
 subject: quoting bug causes solaris pre-10 thread handling bugs

 Quoting problems in pattern matching on the OS name cause Solaris
 versions up through 9 to not be properly recognized in the
 thread-system configuration setup.  This causes our libraries to make
 the erroneous assumption that valid thread support routines are
 available on all Solaris systems, rather than just assuming it for
 Solaris 10 and later.

 The result is assertion failures like this one reported by Meraj
 Mohammed and others:

   Assertion failed: k5int_i->did_run != 0, file krb5_libinit.c, line 63

 Thanks to Tom Shaw for noticing the cause of the problem.

 The bug may be present in the 1.6.x series as well.

ticket: 6579
version_fixed: 1.7.1
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@23641 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 7fc61b00944d9ecd7866d97a7c247dbcbf3e6d02..caa2db3889d75219a12628a1c74b477651d6cce5 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -205,7 +205,7 @@ if test "$enable_thread_support" = yes; then
       # don't exclude CFLAGS when linking.  *sigh*
       PTHREAD_CFLAGS="-D_REENTRANT -D_THREAD_SAFE -D_POSIX_C_SOURCE=199506L"
       ;;
-    solaris2.[1-9])
+    solaris2.[[1-9]])
       # On Solaris 10 with gcc 3.4.3, the autoconf archive macro doesn't
       # get the right result.   XXX What about Solaris 9 and earlier?
       if test "$GCC" = yes ; then