From d9706d9f1195dfa4b10224c26b7ee43777b32477 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 9 Jul 2011 01:56:25 -0700 Subject: [PATCH] * 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 . This is just a quick temporary fix, specific to Emacs; I'll work with the other gnulib maintainers to get a more-permanent fix. --- ChangeLog | 8 +++++++ m4/pthread_sigmask.m4 | 52 +------------------------------------------ 2 files changed, 9 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7504583c25..9f681810d94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-07-09 Paul Eggert + * 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 + . + 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, diff --git a/m4/pthread_sigmask.m4 b/m4/pthread_sigmask.m4 index dfa0f660a75..e98d8e0f4ea 100644 --- a/m4/pthread_sigmask.m4 +++ b/m4/pthread_sigmask.m4 @@ -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_DEFUN([gl_FUNC_PTHREAD_SIGMASK], [ 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 - #include - ]], - [[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 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], 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