Changeset 4843

Timestamp:

06/28/09 18:48:19 (5 months ago)

Author:

balaji

Message:

It looks like just checking for the existence of pthread.h is not
sufficient. We need to check for the existence of libpthread.a as
well. Add -lpthread explicitly if we find it.

Location:

mpich2/trunk/src/pm/hydra

Files:

• configure.in (modified) (1 diff)
• pm/pmiserv/Makefile.mk (modified) (1 diff)
• ui/mpiexec/Makefile.mk (modified) (1 diff)

mpich2/trunk/src/pm/hydra/configure.in

@@ -34 +34 @@
                  sched.h pthread.h sys/stat.h)
 
+dnl Check if the pthread library is present. Apparently, just checking
+dnl for pthread.h is not sufficient.
+AC_CHECK_LIB(pthread,pthread_create,pthread_lib_exists=yes,pthread_lib_exists=no)
+
+dnl Check if the upper-level enabled threads support
+if test "$MPICH2_THREAD_PACKAGE" != "none" -a "$pthread_lib_exists" = "yes" ; then
+   AC_DEFINE(HAVE_THREAD_SUPPORT,1,[Define thread support])
+   LDFLAGS="$LDFLAGS -lpthread"
+fi
+
 dnl Check for necessary functions
 AC_CHECK_FUNCS(gettimeofday time strdup sigaction signal usleep alloca unsetenv \
                strerror strsignal putenv)
-
-dnl Check if the upper-level enabled threads support
-if test "$MPICH2_THREAD_PACKAGE" != "none" ; then
-   AC_DEFINE(HAVE_THREAD_SUPPORT,1,[Define thread support])
-fi
-AM_CONDITIONAL([hydra_include_pthread], [test "$MPICH2_THREAD_PACKAGE" != "none"])
 
 # putenv() sets environment variable

mpich2/trunk/src/pm/hydra/pm/pmiserv/Makefile.mk

@@ -11 +11 @@
         $(top_srcdir)/pm/pmiserv/pmi_proxy_utils.c
 pmi_proxy_LDADD = libhydra.a
-
-if hydra_include_pthread
-pmi_proxy_LDFLAGS = -lpthread
-endif
 
 libpm_a_SOURCES += $(top_srcdir)/pm/pmiserv/pmi_handle.c \

mpich2/trunk/src/pm/hydra/ui/mpiexec/Makefile.mk

@@ -13 +13 @@
 mpiexec_CFLAGS = -I$(top_srcdir)/ui/utils
 
-if hydra_include_pthread
-mpiexec_LDFLAGS = -lpthread
-endif
-
 install-alt-ui: mpiexec
         @if [ ! -d $(DESTDIR)${bindir} ] ; then \