[Emacs-diffs] /srv/bzr/emacs/trunk r106688: Port HAVE_PTHREAD configuration to MirBSD 10 (Bug#10201).

[Paul Eggert]

------------------------------------------------------------
revno: 106688
fixes bug(s): http://debbugs.gnu.org/10201
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2011-12-16 16:51:40 -0800
message:
  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>.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-12-10 12:49:33 +0000
+++ b/ChangeLog 2011-12-17 00:51:40 +0000
@@ -1,3 +1,11 @@
+2011-12-17  Paul Eggert  <address@hidden>
+
+       Port HAVE_PTHREAD configuration to MirBSD 10 (Bug#10201).
+       * configure.in (HAVE_PTHREAD): Check for pthread_atfork if 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>.
+
 2011-12-10  Juanma Barranquero  <address@hidden>
 
        * update-subdirs: Don't set no-byte-compile twice (bug#10260).

=== modified file 'configure.in'
--- a/configure.in      2011-12-15 07:24:10 +0000
+++ b/configure.in      2011-12-17 00:51:40 +0000
@@ -1720,7 +1720,15 @@
 LIB_PTHREAD=
 AC_CHECK_HEADERS(pthread.h)
 if test "$ac_cv_header_pthread_h"; then
-  AC_CHECK_LIB(pthread, pthread_self, HAVE_PTHREAD=yes)
+  dnl gmalloc.c uses pthread_atfork, which is not available on older-style
+  dnl hosts such as MirBSD 10, so test for pthread_atfork instead of merely
+  dnl testing for pthread_self if Emacs uses gmalloc.c.
+  if test "$GMALLOC_OBJ" = gmalloc.o; then
+    emacs_pthread_function=pthread_atfork
+  else
+    emacs_pthread_function=pthread_self
+  fi
+  AC_CHECK_LIB(pthread, $emacs_pthread_function, HAVE_PTHREAD=yes)
 fi
 if test "$HAVE_PTHREAD" = yes; then
   case "${canonical}" in