From: Eric Blake <eblake@redhat.com>
Date: Wed, 6 Jul 2011 15:30:38 +0000 (-0600)
Subject: pthread_sigmask: always replace when not using pthread
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ba0006f0fe8c8b1e1209a8c36724a9e086242b8;p=pspp

pthread_sigmask: always replace when not using pthread

On mingw, when using win32 threading, the pthread_sigmask replacement
function was not being installed.

* m4/pthread_sigmask.m4 (gl_PTHREAD_SIGMASK): Force sigprocmask
replacement when using some threading other than pthread.  Fix
logic bug.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 6fdecebfc3..e1ed45284c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-06  Eric Blake  <eblake@redhat.com>
+
+	pthread_sigmask: always replace when not using pthread
+	* m4/pthread_sigmask.m4 (gl_PTHREAD_SIGMASK): Force sigprocmask
+	replacement when using some threading other than pthread.  Fix
+	logic bug.
+
 2011-07-06  Bruno Haible  <bruno@clisp.org>
 
 	Comments.
diff --git a/m4/pthread_sigmask.m4 b/m4/pthread_sigmask.m4
index 22485bd356..d25e2cc3e7 100644
--- a/m4/pthread_sigmask.m4
+++ b/m4/pthread_sigmask.m4
@@ -1,4 +1,4 @@
-# pthread_sigmask.m4 serial 1
+# pthread_sigmask.m4 serial 2
 dnl Copyright (C) 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,
@@ -13,12 +13,14 @@ AC_DEFUN([gl_PTHREAD_SIGMASK],
       LIBS="$LIBS $LIBMULTITHREAD"
       AC_CHECK_FUNCS([pthread_sigmask])
       LIBS="$gl_save_LIBS"
+    else
+      ac_cv_func_pthread_sigmask=no
     fi
   ], [
     AC_CHECK_FUNCS_ONCE([pthread_sigmask])
   ])
 
   if test $ac_cv_func_pthread_sigmask = no; then
-    REPLACE_PTHREAD_SIGMASK=0
+    REPLACE_PTHREAD_SIGMASK=1
   fi
 ])