aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-12-16 16:51:40 -0800
committerPaul Eggert2011-12-16 16:51:40 -0800
commitadee8a65c46c101249a665ad34bad70fcd8b0deb (patch)
tree2fcd8c477ae64ee6a3c538620a7a7a353c602133
parentf3b316df6114d1b93d3b69c59802148d9656c4d4 (diff)
downloademacs-adee8a65c46c101249a665ad34bad70fcd8b0deb.tar.gz
emacs-adee8a65c46c101249a665ad34bad70fcd8b0deb.zip
Port HAVE_PTHREAD configuration to MirBSD 10 (Bug#10201).
* configure.in (HAVE_PTHREAD): Check for pthread_atforkif linking to gmalloc.c. This should prevent a MirBSD 10 build failure reported by Nelson H. F. Beebe in <http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00065.html>.
-rw-r--r--ChangeLog8
-rw-r--r--configure.in10
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 507848b63b6..23efc30f4fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
12011-12-17 Paul Eggert <eggert@cs.ucla.edu>
2
3 Port HAVE_PTHREAD configuration to MirBSD 10 (Bug#10201).
4 * configure.in (HAVE_PTHREAD): Check for pthread_atfork if linking
5 to gmalloc.c. This should prevent a MirBSD 10 build failure reported
6 by Nelson H. F. Beebe in
7 <http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00065.html>.
8
12011-12-10 Juanma Barranquero <lekktu@gmail.com> 92011-12-10 Juanma Barranquero <lekktu@gmail.com>
2 10
3 * update-subdirs: Don't set no-byte-compile twice (bug#10260). 11 * update-subdirs: Don't set no-byte-compile twice (bug#10260).
diff --git a/configure.in b/configure.in
index b4bb8eb708c..83acc82064e 100644
--- a/configure.in
+++ b/configure.in
@@ -1720,7 +1720,15 @@ dnl Check if pthreads is available.
1720LIB_PTHREAD= 1720LIB_PTHREAD=
1721AC_CHECK_HEADERS(pthread.h) 1721AC_CHECK_HEADERS(pthread.h)
1722if test "$ac_cv_header_pthread_h"; then 1722if test "$ac_cv_header_pthread_h"; then
1723 AC_CHECK_LIB(pthread, pthread_self, HAVE_PTHREAD=yes) 1723 dnl gmalloc.c uses pthread_atfork, which is not available on older-style
1724 dnl hosts such as MirBSD 10, so test for pthread_atfork instead of merely
1725 dnl testing for pthread_self if Emacs uses gmalloc.c.
1726 if test "$GMALLOC_OBJ" = gmalloc.o; then
1727 emacs_pthread_function=pthread_atfork
1728 else
1729 emacs_pthread_function=pthread_self
1730 fi
1731 AC_CHECK_LIB(pthread, $emacs_pthread_function, HAVE_PTHREAD=yes)
1724fi 1732fi
1725if test "$HAVE_PTHREAD" = yes; then 1733if test "$HAVE_PTHREAD" = yes; then
1726 case "${canonical}" in 1734 case "${canonical}" in