X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fpthread.m4;h=6111185fb0baad8b916c00eabddc8165bb19380d;hb=c604bb86746f7f16471a598df94845e42d0e1b5f;hp=541f7aeb60c7e92ff07bfc0310a0817b8733178f;hpb=66cc02681886cc3da705d0efb7a30a54bc8ce6b4;p=gnulib.git

diff --git a/m4/pthread.m4 b/m4/pthread.m4
index 541f7aeb6..6111185fb 100644
--- a/m4/pthread.m4
+++ b/m4/pthread.m4
@@ -1,5 +1,5 @@
 # pthread.m4
-dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_PTHREAD_CHECK],
 [
    AC_REQUIRE([gl_PTHREAD_DEFAULTS])
-   AC_CHECK_HEADERS_ONCE([pthread.h])
    gl_CHECK_NEXT_HEADERS([pthread.h])
    if test $ac_cv_header_pthread_h = yes; then
      HAVE_PTHREAD_H=1
@@ -31,7 +30,11 @@ AC_DEFUN([gl_PTHREAD_CHECK],
       test $ac_cv_type_pthread_t != yes ||
       test $ac_cv_type_pthread_spinlock_t != yes; then
      PTHREAD_H='pthread.h'
+   else
+     PTHREAD_H=
    fi
+   AC_SUBST([PTHREAD_H])
+   AM_CONDITIONAL([GL_GENERATE_PTHREAD_H], [test -n "$PTHREAD_H"])
 
    LIB_PTHREAD=
    if test $ac_cv_header_pthread_h = yes; then
@@ -54,5 +57,4 @@ AC_DEFUN([gl_PTHREAD_DEFAULTS],
   HAVE_PTHREAD_H=1;              AC_SUBST([HAVE_PTHREAD_H])
   HAVE_PTHREAD_T=1;              AC_SUBST([HAVE_PTHREAD_T])
   HAVE_PTHREAD_SPINLOCK_T=1;     AC_SUBST([HAVE_PTHREAD_SPINLOCK_T])
-  PTHREAD_H='';                  AC_SUBST([PTHREAD_H])
 ])