diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/aclocal.m4 | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 45b63c4..282b795 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2004-07-11 Ken Raeburn <raeburn@mit.edu> + + * aclocal.m4 (KRB5_AC_ENABLE_THREADS): Use PTHREAD_CFLAGS and + PTHREAD_LIBS when checking for pthread_mutexattr_setrobust_np + availability with thread support enabled. + 2004-07-09 Ken Raeburn <raeburn@mit.edu> * aclocal.m4 (KRB5_AC_ENABLE_THREADS): Don't test for pthread.h diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 22610ad..8fce1c9 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -162,16 +162,18 @@ AC_CHECK_FUNCS(pthread_once pthread_mutexattr_setrobust_np) old_CC="$CC" test "$PTHREAD_CC" != "" && test "$ac_cv_c_compiler_gnu" = no && CC=$PTHREAD_CC old_CFLAGS="$CFLAGS" -#CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +# On Solaris, -pthreads is added to CFLAGS, no extra explicit libraries. +CFLAGS="$CFLAGS $PTHREAD_CFLAGS" AC_SUBST(PTHREAD_CFLAGS) old_LIBS="$LIBS" -#LIBS="$PTHREAD_LIBS $LIBS" +LIBS="$PTHREAD_LIBS $LIBS" AC_MSG_NOTICE(rechecking with PTHREAD_... options) AC_CHECK_LIB(c, pthread_mutexattr_setrobust_np, [AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP_IN_THREAD_LIB,1,[Define if pthread_mutexattr_setrobust_np is provided in the thread library.])]) ]) LIBS="$old_LIBS" CC="$old_CC" +CFLAGS="$old_CFLAGS" fi dnl This is somewhat gross and should go away when the build system |