revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

Build: Upgrade m4/acx_pthread.m4 to the latest version.

Browse source 
It was renamed to ax_pthread.m4 in Autoconf Archive.
This commit is contained in:
Lasse Collin 2012-05-24 18:37:08 +03:00
parent bfac2be502
commit 7b6ffc9864
2 changed files with 132 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -431,7 +431,7 @@ AC_USE_SYSTEM_EXTENSIONS
if test "x$enable_threads" = xyes; then if test "x$enable_threads" = xyes; then
echo echo
echo "Threading support:" echo "Threading support:"
ACX_PTHREAD AX_PTHREAD
LIBS="$LIBS $PTHREAD_LIBS" LIBS="$LIBS $PTHREAD_LIBS"
AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS" AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC" CC="$PTHREAD_CC"

206
m4/acx_pthread.m4 → m4/ax_pthread.m4
View file

@ -1,93 +1,94 @@
##### http://autoconf-archive.cryp.to/acx_pthread.html # ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
# ===========================================================================
# #
# SYNOPSIS # SYNOPSIS
# #
# ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) # AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
# #
# DESCRIPTION # DESCRIPTION
# #
# This macro figures out how to build C programs using POSIX threads. # This macro figures out how to build C programs using POSIX threads. It
# It sets the PTHREAD_LIBS output variable to the threads library and # sets the PTHREAD_LIBS output variable to the threads library and linker
# linker flags, and the PTHREAD_CFLAGS output variable to any special # flags, and the PTHREAD_CFLAGS output variable to any special C compiler
# C compiler flags that are needed. (The user can also force certain # flags that are needed. (The user can also force certain compiler
# compiler flags/libs to be tested by setting these environment # flags/libs to be tested by setting these environment variables.)
# variables.)
# #
# Also sets PTHREAD_CC to any special C compiler that is needed for # Also sets PTHREAD_CC to any special C compiler that is needed for
# multi-threaded programs (defaults to the value of CC otherwise). # multi-threaded programs (defaults to the value of CC otherwise). (This
# (This is necessary on AIX to use the special cc_r compiler alias.) # is necessary on AIX to use the special cc_r compiler alias.)
# #
# NOTE: You are assumed to not only compile your program with these # NOTE: You are assumed to not only compile your program with these flags,
# flags, but also link it with them as well. e.g. you should link # but also link it with them as well. e.g. you should link with
# with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS # $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
# $LIBS
# #
# If you are only building threads programs, you may wish to use # If you are only building threads programs, you may wish to use these
# these variables in your default LIBS, CFLAGS, and CC: # variables in your default LIBS, CFLAGS, and CC:
# #
# LIBS="$PTHREAD_LIBS $LIBS" # LIBS="$PTHREAD_LIBS $LIBS"
# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" # CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
# CC="$PTHREAD_CC" # CC="$PTHREAD_CC"
# #
# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute # In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
# constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to # has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). # (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
# #
# ACTION-IF-FOUND is a list of shell commands to run if a threads # Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
# library is found, and ACTION-IF-NOT-FOUND is a list of commands to # PTHREAD_PRIO_INHERIT symbol is defined when compiling with
# run it if it is not found. If ACTION-IF-FOUND is not specified, the # PTHREAD_CFLAGS.
# default action will define HAVE_PTHREAD.
# #
# Please let the authors know if this macro fails on any platform, or # ACTION-IF-FOUND is a list of shell commands to run if a threads library
# if you have any other suggestions or comments. This macro was based # is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
# on work by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) # is not found. If ACTION-IF-FOUND is not specified, the default action
# (with help from M. Frigo), as well as ac_pthread and hb_pthread # will define HAVE_PTHREAD.
# macros posted by Alejandro Forero Cuervo to the autoconf macro
# repository. We are also grateful for the helpful feedback of
# numerous users.
# #
# LAST MODIFICATION # Please let the authors know if this macro fails on any platform, or if
# you have any other suggestions or comments. This macro was based on work
# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
# Alejandro Forero Cuervo to the autoconf macro repository. We are also
# grateful for the helpful feedback of numerous users.
# #
# 2007-07-29 # Updated for Autoconf 2.68 by Daniel Richard G.
# #
# COPYLEFT # LICENSE
# #
# Copyright (c) 2007 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 # This program is free software: you can redistribute it and/or modify it
# modify it under the terms of the GNU General Public License as # under the terms of the GNU General Public License as published by the
# published by the Free Software Foundation, either version 3 of the # Free Software Foundation, either version 3 of the License, or (at your
# License, or (at your option) any later version. # option) any later version.
# #
# This program is distributed in the hope that it will be useful, but # This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# General Public License for more details. # Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License along
# along with this program. If not, see # with this program. If not, see <http://www.gnu.org/licenses/>.
# <http://www.gnu.org/licenses/>.
# #
# As a special exception, the respective Autoconf Macro's copyright # As a special exception, the respective Autoconf Macro's copyright owner
# owner gives unlimited permission to copy, distribute and modify the # gives unlimited permission to copy, distribute and modify the configure
# configure scripts that are the output of Autoconf when processing # scripts that are the output of Autoconf when processing the Macro. You
# the Macro. You need not follow the terms of the GNU General Public # need not follow the terms of the GNU General Public License when using
# License when using or distributing such scripts, even though # or distributing such scripts, even though portions of the text of the
# portions of the text of the Macro appear in them. The GNU General # Macro appear in them. The GNU General Public License (GPL) does govern
# Public License (GPL) does govern all other use of the material that # all other use of the material that constitutes the Autoconf Macro.
# constitutes the Autoconf Macro.
# #
# This special exception to the GPL applies to versions of the # This special exception to the GPL applies to versions of the Autoconf
# Autoconf Macro released by the Autoconf Macro Archive. When you # Macro released by the Autoconf Archive. When you make and distribute a
# make and distribute a modified version of the Autoconf Macro, you # modified version of the Autoconf Macro, you may extend this special
# may extend this special exception to the GPL to apply to your # exception to the GPL to apply to your modified version as well.
# modified version as well.
AC_DEFUN([ACX_PTHREAD], [ #serial 18
AU_ALIAS([ACX_PTHREAD], [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
acx_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
# requires special compiler flags (e.g. on True64 or Sequent). # requires special compiler flags (e.g. on True64 or Sequent).
@ -102,9 +103,9 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
save_LIBS="$LIBS" save_LIBS="$LIBS"
LIBS="$PTHREAD_LIBS $LIBS" LIBS="$PTHREAD_LIBS $LIBS"
AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
AC_MSG_RESULT($acx_pthread_ok) AC_MSG_RESULT($ax_pthread_ok)
if test x"$acx_pthread_ok" = xno; then if test x"$ax_pthread_ok" = xno; then
PTHREAD_LIBS="" PTHREAD_LIBS=""
PTHREAD_CFLAGS="" PTHREAD_CFLAGS=""
fi fi
@ -122,7 +123,7 @@ fi
# which indicates that we try without any flags at all, and "pthread-config" # which indicates that we try without any flags at all, and "pthread-config"
# which is a program returning the flags for the Pth emulation library. # which is a program returning the flags for the Pth emulation library.
acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
# The ordering *is* (sometimes) important. Some notes on the # The ordering *is* (sometimes) important. Some notes on the
# individual items follow: # individual items follow:
@ -144,8 +145,8 @@ acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -m
# --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
@ -155,12 +156,16 @@ case "${host_cpu}-${host_os}" in
# who knows whether they'll stub that too in a future libc.) So, # who knows whether they'll stub that too in a future libc.) So,
# we'll just look for -pthreads and -lpthread first: # we'll just look for -pthreads and -lpthread first:
acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
;;
darwin*)
ax_pthread_flags="-pthread $ax_pthread_flags"
;; ;;
esac esac
if test x"$acx_pthread_ok" = xno; then if test x"$ax_pthread_ok" = xno; then
for flag in $acx_pthread_flags; do for flag in $ax_pthread_flags; do
case $flag in case $flag in
none) none)
@ -173,8 +178,8 @@ for flag in $acx_pthread_flags; do
;; ;;
pthread-config) pthread-config)
AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
if test x"$acx_pthread_config" = xno; then continue; fi if test x"$ax_pthread_config" = xno; then continue; fi
PTHREAD_CFLAGS="`pthread-config --cflags`" PTHREAD_CFLAGS="`pthread-config --cflags`"
PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
;; ;;
@ -199,17 +204,23 @@ for flag in $acx_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>
[pthread_t th; pthread_join(th, 0); static void routine(void *a) { a = 0; }
pthread_attr_init(0); pthread_cleanup_push(0, 0); static void *start_routine(void *a) { return a; }],
pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], [pthread_t th; pthread_attr_t attr;
[acx_pthread_ok=yes]) pthread_create(&th, 0, start_routine, 0);
pthread_join(th, 0);
pthread_attr_init(&attr);
pthread_cleanup_push(routine, 0);
pthread_cleanup_pop(0) /* ; */])],
[ax_pthread_ok=yes],
[])
LIBS="$save_LIBS" LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
AC_MSG_RESULT($acx_pthread_ok) AC_MSG_RESULT($ax_pthread_ok)
if test "x$acx_pthread_ok" = xyes; then if test "x$ax_pthread_ok" = xyes; then
break; break;
fi fi
@ -219,7 +230,7 @@ done
fi fi
# Various other checks: # Various other checks:
if test "x$acx_pthread_ok" = xyes; then if test "x$ax_pthread_ok" = xyes; then
save_LIBS="$LIBS" save_LIBS="$LIBS"
LIBS="$PTHREAD_LIBS $LIBS" LIBS="$PTHREAD_LIBS $LIBS"
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
@ -229,8 +240,10 @@ if test "x$acx_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
@ -241,15 +254,32 @@ if test "x$acx_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"
@ -268,12 +298,12 @@ AC_SUBST(PTHREAD_CFLAGS)
AC_SUBST(PTHREAD_CC) AC_SUBST(PTHREAD_CC)
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
if test x"$acx_pthread_ok" = xyes; then if test x"$ax_pthread_ok" = xyes; then
ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
: :
else else
acx_pthread_ok=no ax_pthread_ok=no
$2 $2
fi fi
AC_LANG_RESTORE AC_LANG_POP
])dnl ACX_PTHREAD ])dnl AX_PTHREAD