* aclocal.m4 (KRB5_AC_ENABLE_THREADS): Override guessed PTHREAD_CFLAGS with

correct value for solaris+gcc.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17266 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index ca201e63d968455ccb4fc215abbdbb56a932de9e..9915ca8b99708100edfc46a5d55eedaa460e237a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
        * aclocal.m4 (WITH_CC): Don't use -pedantic on Linux.
        (KRB5_AC_FIND_DLOPEN): New macro.  Set DL_LIB.
        (CONFIG_RULES, AC_KRB5_TCL_TRYOLD): Use it.
+       (KRB5_AC_ENABLE_THREADS): Override guessed PTHREAD_CFLAGS with
+       correct value for solaris+gcc.
 
        Novell merge.
        * aclocal.m4:

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 53423564a31c694bfd8c9c58b12870845eedb7d3..5e303d53e6ac87bd770d6374e8b76706fbe1aa8a 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -171,6 +171,13 @@ 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"
       ;;
+    solaris*)
+      # On Solaris 10 with gcc 3.4.3, the autoconf archive macro doesn't
+      # get the right result.
+      if test "$GCC" = yes ; then
+        PTHREAD_CFLAGS="-D_REENTRANT -pthreads"
+      fi
+      ;;
   esac
   THREAD_SUPPORT=1
 else