diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-04-22 15:10:31 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-04-22 15:10:31 +0200 |
| commit | aa9dc79d64b33822e516b6b894c7fb8fd2247981 (patch) | |
| tree | 23661cead8874f1c926d0dfb1858111a21a9bf08 /m4 | |
| parent | f498e10db681dfe9061348820c67b6f80f161af5 (diff) | |
| download | gnulib-aa9dc79d64b33822e516b6b894c7fb8fd2247981.tar.gz | |
threadlib, pthread-h, threads-h: Avoid mingw's libwinpthread by default.
* m4/threadlib.m4 (gl_THREADLIB_EARLY_BODY): Set
gl_use_winpthreads_default to 'no' by default.
(gl_AVOID_WINPTHREAD): Update comments.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/threadlib.m4 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index c19d047221..4348dc3291 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,4 +1,4 @@ -# threadlib.m4 serial 36 +# threadlib.m4 serial 37 dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -439,7 +439,9 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY], m4_ifdef([gl_THREADLIB_DEFAULT_NO], [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])], [m4_divert_text([DEFAULTS], [gl_use_threads_default=])]) - m4_divert_text([DEFAULTS], [gl_use_winpthreads_default=]) + dnl gl_use_winpthreads_default defaults to 'no', because in mingw 10, like + dnl in mingw 5, the use of libwinpthread still makes test-pthread-tss crash. + m4_divert_text([DEFAULTS], [gl_use_winpthreads_default=no]) AC_ARG_ENABLE([threads], AS_HELP_STRING([--enable-threads={isoc|posix|isoc+posix|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [ AS_HELP_STRING([--disable-threads], [build without multithread safety])]), @@ -605,7 +607,8 @@ dnl ------------------- dnl Sets the gl_THREADLIB default so that on mingw, a dependency to the dnl libwinpthread DLL (mingw-w64 winpthreads library) is avoided. dnl The user can still override it at installation time, by using the -dnl configure option '--enable-threads'. +dnl configure option '--enable-threads=posix'. +dnl As of 2023, this is now the default. AC_DEFUN([gl_AVOID_WINPTHREAD], [ m4_divert_text([INIT_PREPARE], [gl_use_winpthreads_default=no]) |