Disable multithreading by default on OSF/1.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 05ca332149ef518a2fb1fef8a8d8475555d5832d..e9dd4ffb83b22baf1b6df6955f66f9d31b384bb7 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-18  Bruno Haible  <bruno@clisp.org>
+
+       * lock.m4 (gl_LOCK_BODY): Change the default value of gl_use_threads on
+       OSF/1 to no.
+       Reported by Stephen Cartwright <sgcartwr@ucalgary.ca>.
+
 2006-07-21  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.15 released.

diff --git a/gettext-runtime/m4/lock.m4 b/gettext-runtime/m4/lock.m4
index d1ea1ca83f5e8c50aa51dccdd4640a1037c02603..8f3fd0a4af06b893c4862fe0a484d7e2e658ff5b 100644 (file)
--- a/gettext-runtime/m4/lock.m4
+++ b/gettext-runtime/m4/lock.m4
@@ -1,5 +1,5 @@
-# lock.m4 serial 2 (gettext-0.15)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# lock.m4 serial 3 (gettext-0.15.1)
+dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -40,7 +40,15 @@ AC_DEFUN([gl_LOCK_BODY],
   AC_ARG_ENABLE(threads,
 AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
 AC_HELP_STRING([--disable-threads], [build without multithread safety]),
-    gl_use_threads=$enableval, gl_use_threads=yes)
+    [gl_use_threads=$enableval],
+    [case "$host_os" in
+       dnl Disable multithreading by default on OSF/1, because it interferes
+       dnl with fork()/exec(): When msgexec is linked with -lpthread, its child
+       dnl process gets an endless segmentation fault inside execvp().
+       osf*) gl_use_threads=no ;;
+       *)    gl_use_threads=yes ;;
+     esac
+    ])
   gl_threads_api=none
   LIBTHREAD=
   LTLIBTHREAD=