X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=f92240e02700a628a36b5f3e8e0f75953c08d75a;hp=6925926bcf9bd00772944cc5ddd94ee194c4a203;hb=0ecb3fde04135d76545ce55d80abea9aef465b54;hpb=02be55611d3b1c7bf4fdfcb3a9c98f621882d417 diff --git a/configure.ac b/configure.ac index 6925926..f92240e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,13 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([userspace-rcu], [0.3.4], [mathieu dot desnoyers at polymtl dot ca]) +AC_INIT([userspace-rcu], [0.4.3], [mathieu dot desnoyers at efficios dot com]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AC_CONFIG_SRCDIR([urcu.h]) AM_PROG_MKDIR_P @@ -48,12 +50,23 @@ case $host_cpu in s390) ARCHTYPE="s390" ;; s390x) ARCHTYPE="s390" ;; sparc64) ARCHTYPE="sparc64" ;; + alpha*) ARCHTYPE="alpha" ;; *) ARCHTYPE="unknown";; esac -if test "$ARCHTYPE" = "unknown"; then - AC_MSG_ERROR([Unable to detect the architecture.]) +if test "$ARCHTYPE" != "unknown"; then + UATOMICSRC=urcu/uatomic_arch_$ARCHTYPE.h + ARCHSRC=urcu/arch_$ARCHTYPE.h +else + UATOMICSRC=urcu/uatomic_generic.h + ARCHSRC=urcu/arch_generic.h +fi +if test "x$ARCHTYPE" != xx86 -a "x$ARCHTYPE" != xppc; then + APISRC=tests/api_gcc.h +else + APISRC=tests/api_$ARCHTYPE.h fi + AC_SUBST(ARCHTYPE) AC_SUBST(SUBARCHTYPE) @@ -93,8 +106,6 @@ AC_TRY_COMPILE( AM_CONDITIONAL([COMPAT_FUTEX], [ test "x$compat_futex_test" = "x1" ]) -AM_CONDITIONAL([GCC_API], [test "x$ARCHTYPE" != xx86 -a "x$ARCHTYPE" != xppc]) - AM_CONDITIONAL([COMPAT_ARCH], [test "x$SUBARCHTYPE" = xx86compat ]) [ @@ -202,6 +213,11 @@ AC_CHECK_FUNCS( CFLAGS=$saved_CFLAGS +AC_CONFIG_LINKS([ + urcu/arch.h:$ARCHSRC + urcu/uatomic_arch.h:$UATOMICSRC + tests/api.h:$APISRC +]) AC_CONFIG_FILES([ Makefile tests/Makefile