[Emacs-diffs] /srv/bzr/emacs/trunk r105055: * m4/pthread_sigmask.m4 (gl_FUNC_PTHREAD_SIGMASK): Omit gl_THREADLIB

[Paul Eggert]

------------------------------------------------------------
revno: 105055
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-09 01:56:25 -0700
message:
  * m4/pthread_sigmask.m4 (gl_FUNC_PTHREAD_SIGMASK): Omit gl_THREADLIB
  
  test, which runs afoul of Automake installations where, for example,
  /usr/share/aclocal contains a copy of gl_THREADLIB.
  Problem reported by Sven Joachim in
  <http://lists.gnu.org/archive/html/emacs-devel/2011-07/msg00529.html>.
  This is just a quick temporary fix, specific to Emacs; I'll work
  with the other gnulib maintainers to get a more-permanent fix.
modified:
  ChangeLog
  m4/pthread_sigmask.m4

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-07-09 00:23:12 +0000
+++ b/ChangeLog 2011-07-09 08:56:25 +0000
@@ -1,5 +1,13 @@
 2011-07-09  Paul Eggert  <address@hidden>
 
+       * m4/pthread_sigmask.m4 (gl_FUNC_PTHREAD_SIGMASK): Omit gl_THREADLIB
+       test, which runs afoul of Automake installations where, for example,
+       /usr/share/aclocal contains a copy of gl_THREADLIB.
+       Problem reported by Sven Joachim in
+       <http://lists.gnu.org/archive/html/emacs-devel/2011-07/msg00529.html>.
+       This is just a quick temporary fix, specific to Emacs; I'll work
+       with the other gnulib maintainers to get a more-permanent fix.
+
        Add gnulib's strtoimax module, needed on Solaris 8.
        * Makefile.in (GNULIB_MODULES): Add strtoimax.
        * lib/strtoll.c, m4/strtoimax.m4, m4/strtoll.m4: New files,

=== modified file 'm4/pthread_sigmask.m4'
--- a/m4/pthread_sigmask.m4     2011-07-08 20:20:19 +0000
+++ b/m4/pthread_sigmask.m4     2011-07-09 08:56:25 +0000
@@ -1,4 +1,4 @@
-# pthread_sigmask.m4 serial 7
+# pthread_sigmask.m4 serial 7-emacs1
 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,
@@ -8,55 +8,6 @@
 [
   AC_CHECK_FUNCS_ONCE([pthread_sigmask])
   LIB_PTHREAD_SIGMASK=
-  m4_ifdef([gl_THREADLIB], [
-    AC_REQUIRE([gl_THREADLIB])
-    if test "$gl_threads_api" = posix; then
-      if test $ac_cv_func_pthread_sigmask = yes; then
-        dnl pthread_sigmask is available without -lpthread.
-        :
-      else
-        if test -n "$LIBMULTITHREAD"; then
-          AC_CACHE_CHECK([for pthread_sigmask in $LIBMULTITHREAD],
-            [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD],
-            [gl_save_LIBS="$LIBS"
-             LIBS="$LIBS $LIBMULTITHREAD"
-             AC_LINK_IFELSE(
-               [AC_LANG_PROGRAM(
-                  [[#include <pthread.h>
-                    #include <signal.h>
-                  ]],
-                  [[return pthread_sigmask (0, (sigset_t *) 0, (sigset_t *) 
0);]])
-               ],
-               [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes],
-               [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no])
-             LIBS="$gl_save_LIBS"
-            ])
-          if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
-            dnl pthread_sigmask is available with -lpthread.
-            LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD"
-          else
-            dnl pthread_sigmask is not available at all.
-            HAVE_PTHREAD_SIGMASK=0
-          fi
-        else
-          dnl pthread_sigmask is not available at all.
-          HAVE_PTHREAD_SIGMASK=0
-        fi
-      fi
-    else
-      dnl pthread_sigmask may exist but does not interoperate with the chosen
-      dnl multithreading facility.
-      dnl If "$gl_threads_api" = pth, we could use the function pth_sigmask,
-      dnl but it is equivalent to sigprocmask, so we choose to emulate
-      dnl pthread_sigmask with sigprocmask also in this case. This yields fewer
-      dnl link dependencies.
-      if test $ac_cv_func_pthread_sigmask = yes; then
-        REPLACE_PTHREAD_SIGMASK=1
-      else
-        HAVE_PTHREAD_SIGMASK=0
-      fi
-    fi
-  ] ,[
     dnl gl_THREADLIB is not in use.  Assume the application wants
     dnl POSIX semantics.
     if test $ac_cv_func_pthread_sigmask != yes; then
@@ -69,7 +20,6 @@
         LIB_PTHREAD_SIGMASK=$ac_cv_search_pthread_sigmask
       fi
     fi
-  ])
   AC_SUBST([LIB_PTHREAD_SIGMASK])
   dnl We don't need a variable LTLIB_PTHREAD_SIGMASK, because when
   dnl "$gl_threads_api" = posix, $LTLIBMULTITHREAD and $LIBMULTITHREAD are the