From b7d2e95f49f3b34c9f00a0fb4d9de10bba056180 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 14 Oct 2015 16:23:43 -0400 Subject: [PATCH] Port: cleanup and portability fix to configure.ac MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- .gitignore | 10 +- Makefile.am | 2 +- configure.ac | 76 +++--- {config => m4}/ac_define_dir.m4 | 0 m4/ax_c___attribute__.m4 | 66 +++++ {config => m4}/ax_check_class.m4 | 0 {config => m4}/ax_check_classpath.m4 | 0 {config => m4}/ax_check_rqrd_class.m4 | 0 {config => m4}/ax_compare_version.m4 | 0 {config => m4}/ax_java_options.m4 | 0 {config => m4}/ax_jni_include_dir.m4 | 0 {config => m4}/ax_lib_socket_nsl.m4 | 0 {config => m4}/ax_pkg_swig.m4 | 0 {config => m4}/ax_prog_bison_version.m4 | 0 {config => m4}/ax_prog_flex_version.m4 | 0 {config => m4}/ax_prog_jar.m4 | 0 {config => m4}/ax_prog_java.m4 | 0 {config => m4}/ax_prog_java_works.m4 | 0 {config => m4}/ax_prog_javac.m4 | 0 {config => m4}/ax_prog_javac_works.m4 | 0 {config => m4}/ax_prog_javah.m4 | 0 m4/ax_pthread.m4 | 332 ++++++++++++++++++++++++ {config => m4}/ax_try_compile_java.m4 | 0 {config => m4}/ax_try_run_java.m4 | 0 {config => m4}/config_feature.m4 | 0 {config => m4}/epoll.m4 | 0 {config => m4}/libxml.m4 | 0 27 files changed, 452 insertions(+), 34 deletions(-) rename {config => m4}/ac_define_dir.m4 (100%) create mode 100644 m4/ax_c___attribute__.m4 rename {config => m4}/ax_check_class.m4 (100%) rename {config => m4}/ax_check_classpath.m4 (100%) rename {config => m4}/ax_check_rqrd_class.m4 (100%) rename {config => m4}/ax_compare_version.m4 (100%) rename {config => m4}/ax_java_options.m4 (100%) rename {config => m4}/ax_jni_include_dir.m4 (100%) rename {config => m4}/ax_lib_socket_nsl.m4 (100%) rename {config => m4}/ax_pkg_swig.m4 (100%) rename {config => m4}/ax_prog_bison_version.m4 (100%) rename {config => m4}/ax_prog_flex_version.m4 (100%) rename {config => m4}/ax_prog_jar.m4 (100%) rename {config => m4}/ax_prog_java.m4 (100%) rename {config => m4}/ax_prog_java_works.m4 (100%) rename {config => m4}/ax_prog_javac.m4 (100%) rename {config => m4}/ax_prog_javac_works.m4 (100%) rename {config => m4}/ax_prog_javah.m4 (100%) create mode 100644 m4/ax_pthread.m4 rename {config => m4}/ax_try_compile_java.m4 (100%) rename {config => m4}/ax_try_run_java.m4 (100%) rename {config => m4}/config_feature.m4 (100%) rename {config => m4}/epoll.m4 (100%) rename {config => m4}/libxml.m4 (100%) diff --git a/.gitignore b/.gitignore index 0ce35f950..3e8d05dd5 100644 --- a/.gitignore +++ b/.gitignore @@ -27,16 +27,18 @@ config.status stamp-h1 libtool tags +/config/ # cscope and ctags cscope.* tags # m4 macros not automatically generated -/config/ -!config/epoll.m4 -!config/config_feature.m4 -!/config/ax_* +/m4/libtool.m4 +/m4/ltoptions.m4 +/m4/ltsugar.m4 +/m4/ltversion.m4 +/m4/lt~obsolete.m4 /src/bin/lttng-sessiond/lttng-sessiond /src/bin/lttng/lttng diff --git a/Makefile.am b/Makefile.am index f5830a744..7b2a23f0d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = -I config +ACLOCAL_AMFLAGS = -I m4 SUBDIRS = include \ src \ diff --git a/configure.ac b/configure.ac index e80ccc8b4..c922e3224 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,59 @@ AC_PREREQ([2.64]) AC_INIT([lttng-tools],[2.8.0-pre],[jeremie.galarneau@efficios.com],[],[https://lttng.org]) + +AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_TARGET AC_CANONICAL_HOST -AC_CONFIG_MACRO_DIR([config]) + AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) AM_MAINTAINER_MODE([enable]) + +# Enable silent rules if available (Introduced in AM 1.11) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -# Compute minor/major/patchlevel version numbers +# Checks for C compiler +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE +AC_PROG_CC +AC_PROG_CC_STDC + +# Checks for programs. +AC_PROG_GREP +AC_PROG_LEX +AC_PROG_MAKE_SET AC_PROG_SED +AC_PROG_YACC +LT_INIT + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_INLINE +AC_TYPE_INT32_T +AC_TYPE_INT64_T +AC_TYPE_MODE_T +AC_TYPE_OFF_T +AC_TYPE_PID_T +AC_TYPE_SIZE_T +AC_TYPE_SSIZE_T +AC_TYPE_UID_T +AC_TYPE_UINT16_T +AC_TYPE_UINT32_T +AC_TYPE_UINT64_T +AC_TYPE_UINT8_T + +AX_C___ATTRIBUTE__ +AS_IF([test "x$ax_cv___attribute__" = "xyes"], + [:], + [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])]) + +AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])]) +LIBS="$PTHREAD_LIBS $LIBS" +CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +CC="$PTHREAD_CC" + +# Compute minor/major/patchlevel version numbers major_version=$(echo AC_PACKAGE_VERSION | $SED 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*.*$/\1/') minor_version=$(echo AC_PACKAGE_VERSION | $SED 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*.*$/\1/') patchlevel_version=$(echo AC_PACKAGE_VERSION | $SED 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\).*$/\1/') @@ -27,9 +71,6 @@ version_description_c=$(echo $version_description | $SED 's/"/\\"/g') AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "") AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description_c"], "") -AC_CONFIG_HEADERS([include/config.h]) - -AC_PROG_GREP # libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321. AC_ARG_ENABLE(libtool-linkdep-fixup, AS_HELP_STRING([--disable-libtool-linkdep-fixup], @@ -39,7 +80,7 @@ AC_ARG_ENABLE(libtool-linkdep-fixup, AS_IF([test "x$libtool_fixup" = "xyes"], [ - libtool_m4="$srcdir/config/libtool.m4" + libtool_m4="$srcdir/m4/libtool.m4" libtool_flag_pattern=".*link_all_deplibs\s*,\s*\$1\s*)" AC_MSG_CHECKING([for occurence(s) of link_all_deplibs = no in $libtool_m4]) libtool_flag_pattern_count=$($GREP -c "$libtool_flag_pattern\s*=\s*no" $libtool_m4) @@ -514,29 +555,6 @@ AC_SUBST([RUN_PYTHON_AGENT_TEST]) AC_SUBST([PYTHON2_AGENT]) AC_SUBST([PYTHON3_AGENT]) -AC_SYS_LARGEFILE - -# C compiler tests -AC_PROG_CC -AC_C_INLINE - -# Type availability checking -AC_TYPE_INT32_T -AC_TYPE_INT64_T -AC_TYPE_MODE_T -AC_TYPE_OFF_T -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_TYPE_SSIZE_T -AC_TYPE_UID_T -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T -AC_TYPE_UINT64_T -AC_TYPE_UINT8_T - -LT_INIT -AC_PROG_YACC -AC_PROG_LEX if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-parser.h"; then if test x"$YACC" != "xbison -y"; then diff --git a/config/ac_define_dir.m4 b/m4/ac_define_dir.m4 similarity index 100% rename from config/ac_define_dir.m4 rename to m4/ac_define_dir.m4 diff --git a/m4/ax_c___attribute__.m4 b/m4/ax_c___attribute__.m4 new file mode 100644 index 000000000..cf3d62bbd --- /dev/null +++ b/m4/ax_c___attribute__.m4 @@ -0,0 +1,66 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_c___attribute__.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_C___ATTRIBUTE__ +# +# DESCRIPTION +# +# Provides a test for the compiler support of __attribute__ extensions. +# Defines HAVE___ATTRIBUTE__ if it is found. +# +# LICENSE +# +# Copyright (c) 2008 Stepan Kasal +# Copyright (c) 2008 Christian Haggstrom +# Copyright (c) 2008 Ryan McCabe +# +# 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 +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_C___ATTRIBUTE__], [ + AC_CACHE_CHECK([for __attribute__], [ax_cv___attribute__], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + static void foo(void) __attribute__ ((unused)); + static void + foo(void) { + exit(1); + } + ]], [])], + [ax_cv___attribute__=yes], + [ax_cv___attribute__=no] + ) + ]) + if test "$ax_cv___attribute__" = "yes"; then + AC_DEFINE([HAVE___ATTRIBUTE__], 1, [define if your compiler has __attribute__]) + fi +]) diff --git a/config/ax_check_class.m4 b/m4/ax_check_class.m4 similarity index 100% rename from config/ax_check_class.m4 rename to m4/ax_check_class.m4 diff --git a/config/ax_check_classpath.m4 b/m4/ax_check_classpath.m4 similarity index 100% rename from config/ax_check_classpath.m4 rename to m4/ax_check_classpath.m4 diff --git a/config/ax_check_rqrd_class.m4 b/m4/ax_check_rqrd_class.m4 similarity index 100% rename from config/ax_check_rqrd_class.m4 rename to m4/ax_check_rqrd_class.m4 diff --git a/config/ax_compare_version.m4 b/m4/ax_compare_version.m4 similarity index 100% rename from config/ax_compare_version.m4 rename to m4/ax_compare_version.m4 diff --git a/config/ax_java_options.m4 b/m4/ax_java_options.m4 similarity index 100% rename from config/ax_java_options.m4 rename to m4/ax_java_options.m4 diff --git a/config/ax_jni_include_dir.m4 b/m4/ax_jni_include_dir.m4 similarity index 100% rename from config/ax_jni_include_dir.m4 rename to m4/ax_jni_include_dir.m4 diff --git a/config/ax_lib_socket_nsl.m4 b/m4/ax_lib_socket_nsl.m4 similarity index 100% rename from config/ax_lib_socket_nsl.m4 rename to m4/ax_lib_socket_nsl.m4 diff --git a/config/ax_pkg_swig.m4 b/m4/ax_pkg_swig.m4 similarity index 100% rename from config/ax_pkg_swig.m4 rename to m4/ax_pkg_swig.m4 diff --git a/config/ax_prog_bison_version.m4 b/m4/ax_prog_bison_version.m4 similarity index 100% rename from config/ax_prog_bison_version.m4 rename to m4/ax_prog_bison_version.m4 diff --git a/config/ax_prog_flex_version.m4 b/m4/ax_prog_flex_version.m4 similarity index 100% rename from config/ax_prog_flex_version.m4 rename to m4/ax_prog_flex_version.m4 diff --git a/config/ax_prog_jar.m4 b/m4/ax_prog_jar.m4 similarity index 100% rename from config/ax_prog_jar.m4 rename to m4/ax_prog_jar.m4 diff --git a/config/ax_prog_java.m4 b/m4/ax_prog_java.m4 similarity index 100% rename from config/ax_prog_java.m4 rename to m4/ax_prog_java.m4 diff --git a/config/ax_prog_java_works.m4 b/m4/ax_prog_java_works.m4 similarity index 100% rename from config/ax_prog_java_works.m4 rename to m4/ax_prog_java_works.m4 diff --git a/config/ax_prog_javac.m4 b/m4/ax_prog_javac.m4 similarity index 100% rename from config/ax_prog_javac.m4 rename to m4/ax_prog_javac.m4 diff --git a/config/ax_prog_javac_works.m4 b/m4/ax_prog_javac_works.m4 similarity index 100% rename from config/ax_prog_javac_works.m4 rename to m4/ax_prog_javac_works.m4 diff --git a/config/ax_prog_javah.m4 b/m4/ax_prog_javah.m4 similarity index 100% rename from config/ax_prog_javah.m4 rename to m4/ax_prog_javah.m4 diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 new file mode 100644 index 000000000..d383ad5c6 --- /dev/null +++ b/m4/ax_pthread.m4 @@ -0,0 +1,332 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_pthread.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro figures out how to build C programs using POSIX threads. It +# sets the PTHREAD_LIBS output variable to the threads library and linker +# flags, and the PTHREAD_CFLAGS output variable to any special C compiler +# flags that are needed. (The user can also force certain compiler +# flags/libs to be tested by setting these environment variables.) +# +# Also sets PTHREAD_CC to any special C compiler that is needed for +# multi-threaded programs (defaults to the value of CC otherwise). (This +# is necessary on AIX to use the special cc_r compiler alias.) +# +# NOTE: You are assumed to not only compile your program with these flags, +# but also link it with them as well. e.g. you should link with +# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS +# +# If you are only building threads programs, you may wish to use these +# variables in your default LIBS, CFLAGS, and CC: +# +# LIBS="$PTHREAD_LIBS $LIBS" +# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +# CC="$PTHREAD_CC" +# +# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant +# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name +# (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 +# 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 +# will define HAVE_PTHREAD. +# +# 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. +# +# Updated for Autoconf 2.68 by Daniel Richard G. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2011 Daniel Richard G. +# +# 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 +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 21 + +AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) +AC_DEFUN([AX_PTHREAD], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_LANG_PUSH([C]) +ax_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) + AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes]) + AC_MSG_RESULT([$ax_pthread_ok]) + if test x"$ax_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# 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. + +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 +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case ${host_os} in + solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" + ;; + + darwin*) + ax_pthread_flags="-pthread $ax_pthread_flags" + ;; +esac + +# Clang doesn't consider unrecognized options an error unless we specify +# -Werror. We throw in some extra Clang-specific options to ensure that +# this doesn't happen for GCC, which also accepts -Werror. + +AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags]) +save_CFLAGS="$CFLAGS" +ax_pthread_extra_flags="-Werror" +CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])], + [AC_MSG_RESULT([yes])], + [ax_pthread_extra_flags= + AC_MSG_RESULT([no])]) +CFLAGS="$save_CFLAGS" + +if test x"$ax_pthread_ok" = xno; then +for flag in $ax_pthread_flags; do + + case $flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $flag]) + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) + if test x"$ax_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$flag]) + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; }], + [pthread_t th; pthread_attr_t attr; + 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" + CFLAGS="$save_CFLAGS" + + AC_MSG_RESULT([$ax_pthread_ok]) + if test "x$ax_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$ax_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + AC_MSG_CHECKING([for joinable pthread attribute]) + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [int attr = $attr; return attr /* ; */])], + [attr_name=$attr; break], + []) + done + AC_MSG_RESULT([$attr_name]) + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name], + [Define to necessary symbol if this constant + uses a non-standard name on your system.]) + fi + + AC_MSG_CHECKING([if more special flags are required for pthreads]) + flag=no + case ${host_os} in + aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; + osf* | hpux*) flag="-D_REENTRANT";; + solaris*) + if test "$GCC" = "yes"; then + flag="-D_REENTRANT" + else + # TODO: What about Clang on Solaris? + flag="-mt -D_REENTRANT" + fi + ;; + esac + AC_MSG_RESULT([$flag]) + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], + [ax_cv_PTHREAD_PRIO_INHERIT], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[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" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: compile with *_r variant + if test "x$GCC" != xyes; then + case $host_os in + aix*) + AS_CASE(["x/$CC"], + [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], + [#handle absolute path differently from PATH based program lookup + AS_CASE(["x$CC"], + [x/*], + [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], + [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) + ;; + esac + fi +fi + +test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" + +AC_SUBST([PTHREAD_LIBS]) +AC_SUBST([PTHREAD_CFLAGS]) +AC_SUBST([PTHREAD_CC]) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +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]) + : +else + ax_pthread_ok=no + $2 +fi +AC_LANG_POP +])dnl AX_PTHREAD diff --git a/config/ax_try_compile_java.m4 b/m4/ax_try_compile_java.m4 similarity index 100% rename from config/ax_try_compile_java.m4 rename to m4/ax_try_compile_java.m4 diff --git a/config/ax_try_run_java.m4 b/m4/ax_try_run_java.m4 similarity index 100% rename from config/ax_try_run_java.m4 rename to m4/ax_try_run_java.m4 diff --git a/config/config_feature.m4 b/m4/config_feature.m4 similarity index 100% rename from config/config_feature.m4 rename to m4/config_feature.m4 diff --git a/config/epoll.m4 b/m4/epoll.m4 similarity index 100% rename from config/epoll.m4 rename to m4/epoll.m4 diff --git a/config/libxml.m4 b/m4/libxml.m4 similarity index 100% rename from config/libxml.m4 rename to m4/libxml.m4 -- 2.34.1