Commit f11e73c8 authored by Vincent Lefèvre's avatar Vincent Lefèvre
Browse files

Autoconf / AX_PTHREAD related update and cleanup.

* m4/ax_pthread.m4: update to AX_PTHREAD 31, fixing a change
  from AX_PTHREAD 29, which has eventually been regarded as
  a bug (workaround in r14481).
* removed the now unneeded AC_CANONICAL_TARGET;
  updated the corresponding comment.

[From SVN r14578 (trunk)]
parent 93ad99f6
......@@ -34,10 +34,16 @@ dnl some other macros (e.g. AX_PTHREAD 29, committed on 2021-02-19) and
dnl must be called quite early in order to avoid the following warning:
dnl warning: AC_ARG_PROGRAM was called before AC_CANONICAL_TARGET
dnl (we don't use AC_ARG_PROGRAM explicitly, but again, it is invoked by
dnl another macro, apparently AM_INIT_AUTOMAKE).
dnl So we need to call AC_CANONICAL_TARGET here, even if we don't use it.
dnl another macro, apparently AM_INIT_AUTOMAKE). This has eventually been
dnl fixed in AX_PTHREAD 31.
dnl Due to this bug in AX_PTHREAD 29, AC_CANONICAL_HOST was moved here and
dnl AC_CANONICAL_TARGET was added in r14481. However, it is unlikely that
dnl we need AC_CANONICAL_TARGET in the future; see the comments at
dnl (introducing AX_PTHREAD 29). Thus it is probably better to avoid it,
dnl as it could cause confusion. But let's keep AC_CANONICAL_HOST here,
dnl since this may be a better place than later.
dnl Older Automake versions than 1.13 may still be supported, but no longer
dnl tested, and many things have changed in 1.13. Moreover the INSTALL file
......@@ -87,11 +87,11 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
#serial 30
#serial 31
......@@ -158,7 +158,7 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
# --thread-safe: KAI C++
# pthread-config: use pthread-config program (for GNU Pth library)
case $target_os in
case $host_os in
......@@ -248,7 +248,7 @@ AS_IF([test "x$ax_pthread_clang" = "xyes"],
# definitions is, on some systems, a strong hint that pthreads support is
# correctly enabled
case $target_os in
case $host_os in
darwin* | hpux* | linux* | osf* | solaris*)
......@@ -450,7 +450,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
AC_CACHE_CHECK([whether more special flags are required for pthreads],
case $target_os in
case $host_os in
......@@ -480,7 +480,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
# More AIX lossage: compile with *_r variant
if test "x$GCC" != "xyes"; then
case $target_os in
case $host_os in
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment