From 7696971fe7b34797cf5af36c8a694cf4ac94e09a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Fri, 3 Jun 2005 10:43:19 +0000 Subject: [PATCH] rework how pthreads support to turned on/off, always run though the switch to figure out what the linker/compiler flag are git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15349 ec53bebd-3082-4978-b11e-865c3cabbd6b --- cf/pthreads.m4 | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/cf/pthreads.m4 b/cf/pthreads.m4 index cb8b7d58e..2a1bc0bc1 100644 --- a/cf/pthreads.m4 +++ b/cf/pthreads.m4 @@ -3,18 +3,14 @@ dnl $Id$ AC_DEFUN([KRB_PTHREADS], [ AC_MSG_CHECKING(if compiling threadsafe libraries) -if test "$PTHREADS_LIBS" = "" ; then - PTHREADS_LIBS="-pthread" -fi - AC_ARG_ENABLE(pthread-support, AS_HELP_STRING([--enable-pthread-support], [if you want thread safe libraries]), [],[enable_pthread_support=maybe]) -if test "$enable_pthread_support" = maybe; then + case "$host" in *-*-solaris2*) - enable_pthread_support=yes + native_pthread_support=yes if test "$GCC" = yes; then PTHREADS_CFLAGS=-pthreads PTHREADS_LIBS=-pthreads @@ -24,41 +20,47 @@ case "$host" in fi ;; *-*-netbsd*) - enable_pthread_support="if running netbsd 1.6T or newer" + native_pthread_support="if running netbsd 1.6T or newer" dnl heim_threads.h knows this PTHREADS_LIBS="" ;; *-*-freebsd5*) - enable_pthread_support=yes + native_pthread_support=yes ;; *-*-linux* | *-*-linux-gnu) case `uname -r` in 2.*) - enable_pthread_support=yes + native_pthread_support=yes PTHREADS_CFLAGS=-pthread + PTHREADS_LIBS=-pthread ;; esac ;; *-*-aix*) if test "$GCC" = yes; then - enable_pthread_support=yes + native_pthread_support=yes + PTHREADS_LIBS="-pthread" elif expr "$CC" : ".*_r" > /dev/null ; then - enable_pthread_support=yes + native_pthread_support=yes PTHREADS_CFLAGS="" PTHREADS_LIBS="" else - enable_pthread_support=no + native_pthread_support=no fi ;; mips-sgi-irix6.[[5-9]]) # maybe works for earlier versions too - enable_pthread_support=yes + native_pthread_support=yes PTHREADS_LIBS="-lpthread" ;; *) - enable_pthread_support=no + native_pthread_support=no ;; esac + +if test "$enable_pthread_support" = maybe ; then + enable_pthread_support="$native_pthread_support" fi + if test "$enable_pthread_support" != no; then AC_DEFINE(ENABLE_PTHREAD_SUPPORT, 1, [Define if you want have a thread safe libraries])