diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2005-06-21 03:14:53 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2005-06-21 03:14:53 +0000 |
| commit | 13a83f750fbfdd0db56a46adaf0ed48c6c889f09 (patch) | |
| tree | b760f2ae56e9a9368e5b026725ede8c2b35bf74b | |
| parent | 7eb3f3dedaa4c0edbe14c3d3d9617051c31c3e69 (diff) | |
| download | krb5-13a83f750fbfdd0db56a46adaf0ed48c6c889f09.tar.gz krb5-13a83f750fbfdd0db56a46adaf0ed48c6c889f09.tar.xz krb5-13a83f750fbfdd0db56a46adaf0ed48c6c889f09.zip | |
* 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
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/aclocal.m4 | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ca201e63d..9915ca8b9 100644 --- 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 53423564a..5e303d53e 100644 --- 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 |