mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
Build: Upgrade m4/acx_pthread.m4 to the latest version.
This commit is contained in:
parent
d05d6d65c4
commit
ab25b82a91
1 changed files with 62 additions and 36 deletions
|
@ -33,6 +33,10 @@
|
||||||
# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
|
# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
|
||||||
# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
|
# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
|
||||||
#
|
#
|
||||||
|
# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
|
||||||
|
# PTHREAD_PRIO_INHERIT symbol is defined when compiling with
|
||||||
|
# PTHREAD_CFLAGS.
|
||||||
|
#
|
||||||
# ACTION-IF-FOUND is a list of shell commands to run if a threads library
|
# ACTION-IF-FOUND is a list of shell commands to run if a threads library
|
||||||
# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
|
# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
|
||||||
# is not found. If ACTION-IF-FOUND is not specified, the default action
|
# is not found. If ACTION-IF-FOUND is not specified, the default action
|
||||||
|
@ -45,9 +49,12 @@
|
||||||
# Alejandro Forero Cuervo to the autoconf macro repository. We are also
|
# Alejandro Forero Cuervo to the autoconf macro repository. We are also
|
||||||
# grateful for the helpful feedback of numerous users.
|
# grateful for the helpful feedback of numerous users.
|
||||||
#
|
#
|
||||||
|
# Updated for Autoconf 2.68 by Daniel Richard G.
|
||||||
|
#
|
||||||
# LICENSE
|
# LICENSE
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
|
# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
|
||||||
|
# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify it
|
# This program is free software: you can redistribute it and/or modify it
|
||||||
# under the terms of the GNU General Public License as published by the
|
# under the terms of the GNU General Public License as published by the
|
||||||
|
@ -75,13 +82,12 @@
|
||||||
# modified version of the Autoconf Macro, you may extend this special
|
# modified version of the Autoconf Macro, you may extend this special
|
||||||
# exception to the GPL to apply to your modified version as well.
|
# exception to the GPL to apply to your modified version as well.
|
||||||
|
|
||||||
#serial 11
|
#serial 18
|
||||||
|
|
||||||
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
|
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
|
||||||
AC_DEFUN([AX_PTHREAD], [
|
AC_DEFUN([AX_PTHREAD], [
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
AC_LANG_SAVE
|
AC_LANG_PUSH([C])
|
||||||
AC_LANG_C
|
|
||||||
ax_pthread_ok=no
|
ax_pthread_ok=no
|
||||||
|
|
||||||
# We used to check for pthread.h first, but this fails if pthread.h
|
# We used to check for pthread.h first, but this fails if pthread.h
|
||||||
|
@ -139,8 +145,8 @@ ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mt
|
||||||
# --thread-safe: KAI C++
|
# --thread-safe: KAI C++
|
||||||
# pthread-config: use pthread-config program (for GNU Pth library)
|
# pthread-config: use pthread-config program (for GNU Pth library)
|
||||||
|
|
||||||
case "${host_cpu}-${host_os}" in
|
case ${host_os} in
|
||||||
*solaris*)
|
solaris*)
|
||||||
|
|
||||||
# On Solaris (at least, for some versions), libc contains stubbed
|
# On Solaris (at least, for some versions), libc contains stubbed
|
||||||
# (non-functional) versions of the pthreads routines, so link-based
|
# (non-functional) versions of the pthreads routines, so link-based
|
||||||
|
@ -153,7 +159,7 @@ case "${host_cpu}-${host_os}" in
|
||||||
ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
|
ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-darwin*)
|
darwin*)
|
||||||
ax_pthread_flags="-pthread $ax_pthread_flags"
|
ax_pthread_flags="-pthread $ax_pthread_flags"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -198,16 +204,17 @@ for flag in $ax_pthread_flags; do
|
||||||
# pthread_cleanup_push because it is one of the few pthread
|
# pthread_cleanup_push because it is one of the few pthread
|
||||||
# functions on Solaris that doesn't have a non-functional libc stub.
|
# functions on Solaris that doesn't have a non-functional libc stub.
|
||||||
# We try pthread_create on general principles.
|
# We try pthread_create on general principles.
|
||||||
AC_TRY_LINK([#include <pthread.h>
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
|
||||||
static void routine(void* a) {a=0;}
|
static void routine(void *a) { a = 0; }
|
||||||
static void* start_routine(void* a) {return a;}],
|
static void *start_routine(void *a) { return a; }],
|
||||||
[pthread_t th; pthread_attr_t attr;
|
[pthread_t th; pthread_attr_t attr;
|
||||||
pthread_create(&th,0,start_routine,0);
|
pthread_create(&th, 0, start_routine, 0);
|
||||||
pthread_join(th, 0);
|
pthread_join(th, 0);
|
||||||
pthread_attr_init(&attr);
|
pthread_attr_init(&attr);
|
||||||
pthread_cleanup_push(routine, 0);
|
pthread_cleanup_push(routine, 0);
|
||||||
pthread_cleanup_pop(0); ],
|
pthread_cleanup_pop(0) /* ; */])],
|
||||||
[ax_pthread_ok=yes])
|
[ax_pthread_ok=yes],
|
||||||
|
[])
|
||||||
|
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
CFLAGS="$save_CFLAGS"
|
CFLAGS="$save_CFLAGS"
|
||||||
|
@ -233,8 +240,10 @@ if test "x$ax_pthread_ok" = xyes; then
|
||||||
AC_MSG_CHECKING([for joinable pthread attribute])
|
AC_MSG_CHECKING([for joinable pthread attribute])
|
||||||
attr_name=unknown
|
attr_name=unknown
|
||||||
for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
|
for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
|
||||||
AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
|
||||||
[attr_name=$attr; break])
|
[int attr = $attr; return attr /* ; */])],
|
||||||
|
[attr_name=$attr; break],
|
||||||
|
[])
|
||||||
done
|
done
|
||||||
AC_MSG_RESULT($attr_name)
|
AC_MSG_RESULT($attr_name)
|
||||||
if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
|
if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
|
||||||
|
@ -245,15 +254,32 @@ if test "x$ax_pthread_ok" = xyes; then
|
||||||
|
|
||||||
AC_MSG_CHECKING([if more special flags are required for pthreads])
|
AC_MSG_CHECKING([if more special flags are required for pthreads])
|
||||||
flag=no
|
flag=no
|
||||||
case "${host_cpu}-${host_os}" in
|
case ${host_os} in
|
||||||
*-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
|
aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
|
||||||
*solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
|
osf* | hpux*) flag="-D_REENTRANT";;
|
||||||
|
solaris*)
|
||||||
|
if test "$GCC" = "yes"; then
|
||||||
|
flag="-D_REENTRANT"
|
||||||
|
else
|
||||||
|
flag="-mt -D_REENTRANT"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
AC_MSG_RESULT(${flag})
|
AC_MSG_RESULT(${flag})
|
||||||
if test "x$flag" != xno; then
|
if test "x$flag" != xno; then
|
||||||
PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
|
PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
|
||||||
|
ax_cv_PTHREAD_PRIO_INHERIT, [
|
||||||
|
AC_LINK_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
|
||||||
|
[ax_cv_PTHREAD_PRIO_INHERIT=yes],
|
||||||
|
[ax_cv_PTHREAD_PRIO_INHERIT=no])
|
||||||
|
])
|
||||||
|
AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
|
||||||
|
AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
|
||||||
|
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
CFLAGS="$save_CFLAGS"
|
CFLAGS="$save_CFLAGS"
|
||||||
|
|
||||||
|
@ -279,5 +305,5 @@ else
|
||||||
ax_pthread_ok=no
|
ax_pthread_ok=no
|
||||||
$2
|
$2
|
||||||
fi
|
fi
|
||||||
AC_LANG_RESTORE
|
AC_LANG_POP
|
||||||
])dnl AX_PTHREAD
|
])dnl AX_PTHREAD
|
||||||
|
|
Loading…
Reference in a new issue