aboutsummaryrefslogtreecommitdiff
path: root/src/aclocal.m4
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2004-07-11 06:05:24 +0000
committerKen Raeburn <raeburn@mit.edu>2004-07-11 06:05:24 +0000
commitca8170a64365f267048bed62f126b4e1697ad823 (patch)
tree5763ab8214c768c2bc87be8b6ec4a425ddb3a830 /src/aclocal.m4
parent27c59910fe8ad7b41c1ed497038cdd5be6ab0e6a (diff)
downloadkrb5-ca8170a64365f267048bed62f126b4e1697ad823.zip
krb5-ca8170a64365f267048bed62f126b4e1697ad823.tar.gz
krb5-ca8170a64365f267048bed62f126b4e1697ad823.tar.bz2
* aclocal.m4 (KRB5_AC_ENABLE_THREADS): Use PTHREAD_CFLAGS and PTHREAD_LIBS when
checking for pthread_mutexattr_setrobust_np availability with thread support enabled. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16577 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
-rw-r--r--src/aclocal.m46
1 files changed, 4 insertions, 2 deletions
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