X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=6a481e368e9f31a802d0c1507b50a98573964bf1;hp=52b20d841b3124a1ddc95b2b078be47ee89d0af9;hb=9a62b0f0b1c28090b92fabb7932cc20451f3090e;hpb=2f49a496a4d7d3d4cd1b8d8323f907114bf2f3c8 diff --git a/configure.ac b/configure.ac index 52b20d8..6a481e3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,25 +1,22 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - - -AC_INIT([userspace-rcu],[0.7.4],[mathieu dot desnoyers at efficios dot com]) +AC_PREREQ(2.59) +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], [2:0:0]) +AC_SUBST([URCU_LIBRARY_VERSION], [5:0:1]) +AC_CONFIG_HEADERS([include/config.h include/urcu/config.h]) AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_MACRO_DIR([config]) +AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_TARGET AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -m4_include([config/ax_tls.m4]) -AC_CONFIG_SRCDIR([urcu.h]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip nostdinc]) +AM_MAINTAINER_MODE([enable]) -AC_CONFIG_HEADERS([config.h urcu/config.h]) +# Enable silent rules if available (Introduced in AM 1.11) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AH_TEMPLATE([CONFIG_RCU_SMP], [Enable SMP support. With SMP support enabled, uniprocessors are also supported. With SMP support disabled, UP systems work fine, but the behavior of SMP systems is undefined.]) AH_TEMPLATE([CONFIG_RCU_HAVE_FENCE], [Defined when on a system that has memory fence instructions.]) @@ -27,6 +24,7 @@ AH_TEMPLATE([CONFIG_RCU_HAVE_FUTEX], [Defined when on a system with futex suppor 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], @@ -43,23 +41,80 @@ AS_IF([test "x$def_tls_detect" = "x"], [:], [AC_DEFINE_UNQUOTED([CONFIG_RCU_TLS], $def_tls_detect)]) -# Checks for programs. +# Checks for C compiler +AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC +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 +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" # Checks for library functions. -AC_FUNC_MALLOC AC_FUNC_MMAP -AC_CHECK_FUNCS([bzero gettimeofday munmap sched_getcpu strtoul sysconf]) +AC_FUNC_FORK +AC_CHECK_FUNCS([ \ + atexit \ + getcpuid \ + gettid \ + gettimeofday \ + memeset \ + memset \ + munmap \ + sched_getcpu \ + strerror \ + strtoul \ + sysconf \ +]) + +# AC_FUNC_MALLOC causes problems when cross-compiling. +#AC_FUNC_MALLOC + +# Check for headers +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"], @@ -69,24 +124,33 @@ AS_CASE([$host_cpu], [powerpc], [ARCHTYPE="ppc"], [ppc64], [ARCHTYPE="ppc"], [powerpc64], [ARCHTYPE="ppc"], + [powerpc64le], [ARCHTYPE="ppc"], [ppc], [ARCHTYPE="ppc"], [s390], [ARCHTYPE="s390"], [s390x], [ARCHTYPE="s390"], [sparc], [ARCHTYPE="sparc64"], [sparc64], [ARCHTYPE="sparc64"], [alpha*], [ARCHTYPE="alpha"], - [ia64], [ARCHTYPE="gcc"], + [ia64], [ARCHTYPE="ia64"], [arm*], [ARCHTYPE="arm"], + [aarch64*], [ARCHTYPE="aarch64"], [mips*], [ARCHTYPE="mips"], - [tile*], [ARCHTYPE="gcc"], + [nios2*], [ARCHTYPE="nios2"], + [tile*], [ARCHTYPE="tile"], + [hppa*], [ARCHTYPE="hppa"], [ARCHTYPE="unknown"] ) +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]) @@ -135,7 +199,10 @@ AS_IF([test "x$ARCHTYPE" = "xx86"],[ #For now, using lock; addl compatibility mode even for i686, because the #Pentium III is seen as a i686, but lacks mfence instruction. #Only using fence for x86_64. - AS_IF([test "x$host_cpu" != "xi386" -a "x$host_cpu" != "xi486" -a "x$host_cpu" != "xi586" -a "x$host_cpu" != "xi686"],[ + # + #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" -a "x$host_cpu" != "xk1om"],[ AC_MSG_RESULT([yes]) AC_DEFINE([CONFIG_RCU_HAVE_FENCE], [1]) ],[ @@ -160,6 +227,11 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ compat_futex_test=1 ]) +# 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"]) AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"]) @@ -198,12 +270,6 @@ AS_IF([test "x$def_smp_support" = "xyes"], [AC_DEFINE([CONFIG_RCU_SMP], [1])]) # 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"], @@ -213,7 +279,6 @@ AC_CHECK_TYPES([cpu_set_t], 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 int main() { @@ -232,7 +297,6 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ 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 int main() { @@ -282,23 +346,32 @@ AC_CHECK_FUNCS([sched_setaffinity],[ ]) ]) -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 - liburcu.pc - liburcu-bp.pc - liburcu-cds.pc - liburcu-qsbr.pc - liburcu-mb.pc - liburcu-signal.pc + tests/common/Makefile + tests/unit/Makefile + tests/benchmark/Makefile + tests/regression/Makefile + tests/regression/regression_tests + tests/utils/Makefile + 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