AC_PREREQ(2.59)
-AC_INIT([userspace-rcu],[0.8.0],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
+AC_INIT([userspace-rcu],[0.9.0],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
# Following the numbering scheme proposed by libtool for the library version
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([URCU_LIBRARY_VERSION], [3:0:0])
+AC_SUBST([URCU_LIBRARY_VERSION], [5:0:1])
-AC_CONFIG_SRCDIR([urcu.h])
-AC_CONFIG_HEADERS([config.h urcu/config.h])
+AC_CONFIG_HEADERS([include/config.h include/urcu/config.h])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip nostdinc])
AM_MAINTAINER_MODE([enable])
# Enable silent rules if available (Introduced in AM 1.11)
AH_TEMPLATE([CONFIG_RCU_COMPAT_ARCH], [Compatibility mode for i386 which lacks cmpxchg instruction.])
AH_TEMPLATE([CONFIG_RCU_ARM_HAVE_DMB], [Use the dmb instruction if available for use on ARM.])
AH_TEMPLATE([CONFIG_RCU_TLS], [TLS provided by the compiler.])
+AH_TEMPLATE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [clock_gettime() is detected.])
# Allow overriding storage used for TLS variables.
AC_ARG_ENABLE([compiler-tls],
AC_PROG_CC_STDC
# Checks for programs.
+AC_PROG_AWK
AC_PROG_MAKE_SET
AC_CHECK_PROGS(NPROC, [nproc gnproc])
+AC_CHECK_PROGS(GETCONF, [getconf])
+AS_IF([test "x$NPROC" != "x"],
+ [NPROC_CMD=$NPROC],
+ [AS_IF([test "x$GETCONF" != "x"],
+ [NPROC_CMD="$GETCONF _NPROCESSORS_ONLN"],
+ [NPROC_CMD="echo 1"]
+ )]
+)
+AC_SUBST([NPROC_CMD], [$NPROC_CMD])
+
LT_INIT
# Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
AC_TYPE_PID_T
AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT16_T
AC_TYPE_INT32_T
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
CC="$PTHREAD_CC"
# Checks for library functions.
-AC_FUNC_MALLOC
AC_FUNC_MMAP
-AC_CHECK_FUNCS(
- [memset gettimeofday munmap sched_getcpu strtoul sysconf gettid memeset strerror]
-)
+AC_FUNC_FORK
+AC_CHECK_FUNCS([ \
+ atexit \
+ getcpuid \
+ gettid \
+ gettimeofday \
+ memeset \
+ memset \
+ munmap \
+ rand_r \
+ sched_getcpu \
+ strerror \
+ strtoul \
+ sysconf \
+])
+
+# AC_FUNC_MALLOC causes problems when cross-compiling.
+#AC_FUNC_MALLOC
# Check for headers
-AC_CHECK_HEADERS([limits.h stddef.h sys/time.h])
+AC_HEADER_STDBOOL
+AC_CHECK_HEADERS([ \
+ limits.h \
+ stddef.h \
+ sys/param.h \
+ sys/time.h \
+])
# Find arch type
AS_CASE([$host_cpu],
+ [k1om], [ARCHTYPE="x86"],
[i386], [ARCHTYPE="x86" && SUBARCHTYPE="x86compat"],
[i486], [ARCHTYPE="x86"],
[i586], [ARCHTYPE="x86"],
[alpha*], [ARCHTYPE="alpha"],
[ia64], [ARCHTYPE="ia64"],
[arm*], [ARCHTYPE="arm"],
- [aarch64], [ARCHTYPE="aarch64"],
+ [aarch64*], [ARCHTYPE="aarch64"],
[mips*], [ARCHTYPE="mips"],
+ [nios2*], [ARCHTYPE="nios2"],
[tile*], [ARCHTYPE="tile"],
[hppa*], [ARCHTYPE="hppa"],
[ARCHTYPE="unknown"]
)
-AS_CASE([$host],[*-*-linux-androideabi],
- [AM_CONDITIONAL(TARGET_IS_ANDROID, true)],
- [AM_CONDITIONAL(TARGET_IS_ANDROID, false)]
+AS_CASE([$host],[*-cygwin*],
+ [AM_CONDITIONAL(USE_CYGWIN, true)],
+ [AM_CONDITIONAL(USE_CYGWIN, false)]
)
AC_SUBST(ARCHTYPE)
AC_SUBST(SUBARCHTYPE)
-UATOMICSRC=urcu/uatomic/$ARCHTYPE.h
-ARCHSRC=urcu/arch/$ARCHTYPE.h
+UATOMICSRC=include/urcu/uatomic/$ARCHTYPE.h
+ARCHSRC=include/urcu/arch/$ARCHTYPE.h
AS_IF([test "x$SUBARCHTYPE" = xx86compat],[
AC_DEFINE([CONFIG_RCU_COMPAT_ARCH], [1])
#
#k1om is the name for the Intel MIC family (Xeon Phi). It is an x86_64
#variant but lacks fence instructions.
- AS_IF([test "x$host_cpu" != "xi386" -a "x$host_cpu" != "xi486" -a "x$host_cpu" != "xi586" -a "x$host_cpu" != "xi686" -a "x$host_vendor" != "xk1om"],[
+ AS_IF([test "x$host_cpu" != "xi386" -a "x$host_cpu" != "xi486" -a "x$host_cpu" != "xi586" -a "x$host_cpu" != "xi686" -a "x$host_vendor" != "xk1om" -a "x$host_cpu" != "xk1om"],[
AC_MSG_RESULT([yes])
AC_DEFINE([CONFIG_RCU_HAVE_FENCE], [1])
],[
compat_futex_test=1
])
-# Check for pthread
-AC_CHECK_LIB([pthread], [pthread_create],
- [AM_CONDITIONAL(LIBC_INCLUDES_PTHREAD, false)],
- [AC_CHECK_LIB([c], [pthread_create],
- [AM_CONDITIONAL(LIBC_INCLUDES_PTHREAD, true)],
- [AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
- )]
-)
+# Search for clock_gettime
+AC_SEARCH_LIBS([clock_gettime], [rt], [
+ AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1])
+], [])
AM_CONDITIONAL([COMPAT_FUTEX], [test "x$compat_futex_test" = "x1"])
AM_CONDITIONAL([COMPAT_ARCH], [test "x$SUBARCHTYPE" = "xx86compat"])
# int sched_setaffinity (pid_t __pid, const cpu_set_t *__mask);
# ~~~~
-# Since we define _GNU_SOURCE in the sources, must do so too in the
-# autoconf tests, as defining _GNU_SOURCE or not exposes
-# sched_setaffinity bits differently.
-saved_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -D_GNU_SOURCE"
-
AC_CHECK_TYPES([cpu_set_t],
[have_cpu_set_t="yes"],
[have_cpu_set_t="no"],
AC_MSG_CHECKING([whether CPU_ZERO works])
AH_TEMPLATE([HAVE_CPU_ZERO], [Defined to 1 if we have CPU_ZERO and it works])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #define _GNU_SOURCE
#include <sched.h>
int main()
{
AC_MSG_CHECKING([whether CPU_SET works])
AH_TEMPLATE([HAVE_CPU_SET], [Defined to 1 if we have CPU_SET and it works])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #define _GNU_SOURCE
#include <sched.h>
int main()
{
])
])
-CFLAGS=$saved_CFLAGS
+DEFAULT_INCLUDES="-include config.h"
+AC_SUBST(DEFAULT_INCLUDES)
AC_CONFIG_LINKS([
- urcu/arch.h:$ARCHSRC
- urcu/uatomic.h:$UATOMICSRC
+ include/urcu/arch.h:$ARCHSRC
+ include/urcu/uatomic.h:$UATOMICSRC
])
AC_CONFIG_FILES([
Makefile
doc/Makefile
doc/examples/Makefile
+ include/Makefile
+ src/Makefile
tests/Makefile
tests/common/Makefile
tests/unit/Makefile
tests/regression/Makefile
tests/regression/regression_tests
tests/utils/Makefile
- liburcu.pc
- liburcu-bp.pc
- liburcu-cds.pc
- liburcu-qsbr.pc
- liburcu-mb.pc
- liburcu-signal.pc
+ src/liburcu.pc
+ src/liburcu-bp.pc
+ src/liburcu-cds.pc
+ src/liburcu-qsbr.pc
+ src/liburcu-mb.pc
+ src/liburcu-signal.pc
])
AC_OUTPUT
projects / urcu.git / blobdiff