From f48e3cc51c5caab65d2c5031ceaf081161f8edb8 Mon Sep 17 00:00:00 2001 From: nic Date: Fri, 16 Dec 2005 00:48:33 +0000 Subject: [PATCH] r=brian enable pthreads outside of liblustre so that lctl --threads works on a non liblustre build --- lnet/autoconf/lustre-lnet.m4 | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index bda8459..b67c4aa 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -787,7 +787,7 @@ AC_SUBST(LIBWRAP) AC_MSG_CHECKING([whether to use libpthread for lnet library]) AC_ARG_ENABLE([libpthread], AC_HELP_STRING([--disable-libpthread], - [disable libpthread for liblustre]), + [disable libpthread]), [],[enable_libpthread=yes]) if test "$enable_libpthread" = "yes" ; then AC_CHECK_LIB([pthread], [pthread_create], @@ -795,9 +795,13 @@ if test "$enable_libpthread" = "yes" ; then [ENABLE_LIBPTHREAD="no"]) if test "$ENABLE_LIBPTHREAD" = "yes" ; then AC_MSG_RESULT([$ENABLE_LIBPTHREAD]) + PTHREAD_LIBS="-lpthread" + AC_DEFINE([HAVE_LIBPTHREAD], 1, [use libpthread]) else + PTHREAD_LIBS="" AC_MSG_RESULT([no libpthread is found]) fi + AC_SUBST(PTHREAD_LIBS) else AC_MSG_RESULT([no (disabled explicitly)]) ENABLE_LIBPTHREAD="no" @@ -839,13 +843,6 @@ if test x$enable_liblustre = xyes ; then ]) AC_SUBST(CAP_LIBS) - if test "$ENABLE_LIBPTHREAD" = "yes" ; then - PTHREAD_LIBS="-lpthread" - AC_DEFINE([HAVE_LIBPTHREAD], 1, [use libpthread]) - else - PTHREAD_LIBS="" - fi - AC_SUBST(PTHREAD_LIBS) fi LN_CONFIG_UPTLLND -- 1.8.3.1