Cleanup: Check for pthread in Libc
[urcu.git] / configure.ac
index 46770c5d3adfa23b99955dccd29a0c9e4fbc8ad8..774094e0ba4b935f5f2b59a3dfb432434b62633a 100644 (file)
@@ -2,11 +2,11 @@
 # Process this file with autoconf to produce a configure script.
 
 
-AC_INIT([userspace-rcu],[0.6.7],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([userspace-rcu],[0.8.0],[mathieu dot desnoyers at efficios dot com])
 
 # 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], [1:0:0])
+AC_SUBST([URCU_LIBRARY_VERSION], [3:0:0])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([config])
@@ -15,6 +15,8 @@ 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])
 
 AC_CONFIG_HEADERS([config.h urcu/config.h])
@@ -24,6 +26,22 @@ AH_TEMPLATE([CONFIG_RCU_HAVE_FENCE], [Defined when on a system that has memory f
 AH_TEMPLATE([CONFIG_RCU_HAVE_FUTEX], [Defined when on a system with futex support.])
 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.])
+
+# Allow overriding storage used for TLS variables.
+AC_ARG_ENABLE([compiler-tls],
+       AS_HELP_STRING([--disable-compiler-tls], [Use pthread_getspecific() to emulate Thread Local Storage (TLS) variables.]),
+       [def_compiler_tls=$enableval],
+       [def_compiler_tls="yes"])
+
+# If not overridden, use ax_tls.m4 to check if TLS is available.
+AS_IF([test "x$def_compiler_tls" = "xyes"],
+       [AX_TLS([def_tls_detect=$ac_cv_tls], [:])],
+       [:])
+
+AS_IF([test "x$def_tls_detect" = "x"],
+       [:],
+       [AC_DEFINE_UNQUOTED([CONFIG_RCU_TLS], $def_tls_detect)])
 
 # Checks for programs.
 AC_PROG_CC
@@ -38,7 +56,7 @@ AC_TYPE_SIZE_T
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_MMAP
-AC_CHECK_FUNCS([bzero gettimeofday munmap sched_getcpu strtoul sysconf])
+AC_CHECK_FUNCS([bzero gettimeofday munmap sched_getcpu strtoul sysconf gettid])
 
 # Find arch type
 AS_CASE([$host_cpu],
@@ -54,13 +72,21 @@ AS_CASE([$host_cpu],
        [ppc], [ARCHTYPE="ppc"],
        [s390], [ARCHTYPE="s390"],
        [s390x], [ARCHTYPE="s390"],
+       [sparc], [ARCHTYPE="sparc64"],
        [sparc64], [ARCHTYPE="sparc64"],
        [alpha*], [ARCHTYPE="alpha"],
        [ia64], [ARCHTYPE="gcc"],
        [arm*], [ARCHTYPE="arm"],
+       [mips*], [ARCHTYPE="mips"],
+       [tile*], [ARCHTYPE="gcc"],
        [ARCHTYPE="unknown"]
 )
 
+AS_CASE([$host],[*-*-linux-androideabi],
+       [AM_CONDITIONAL(TARGET_IS_ANDROID, true)],
+       [AM_CONDITIONAL(TARGET_IS_ANDROID, false)]
+)
+
 AC_SUBST(ARCHTYPE)
 AC_SUBST(SUBARCHTYPE)
 
@@ -78,7 +104,14 @@ AS_IF([test "$host_cpu" = "armv7l"],[
 # ARM-specific checks
 AS_IF([test "x$ARCHTYPE" = "xarm"],[
        AC_MSG_CHECKING([for dmb instruction])
-       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]], [[asm volatile("dmb":::"memory");]])],[
+       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+                               int main()
+                               {
+                                       asm volatile("dmb":::"memory");
+                                       return 0;
+                               }
+               ]])
+       ],[
                AC_MSG_RESULT([yes])
                AC_DEFINE([CONFIG_RCU_ARM_HAVE_DMB], [1])
        ],[
@@ -86,6 +119,21 @@ AS_IF([test "x$ARCHTYPE" = "xarm"],[
        ])
 ])
 
+# Tile-specific checks
+AS_IF([echo "$host_cpu" | grep "^tile"],[
+       AC_MSG_CHECKING([for Tile architecture type])
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+                               #ifndef __tilegx__
+                               #error
+                               #endif
+               ]])
+       ],[
+               AC_MSG_RESULT([ok])
+       ],[
+               AC_MSG_FAILURE([URCU has only been tested on the TileGx architecture. For other Tile* architectures, please run the tests first and report the results to the maintainer so that proper support can be added.])
+       ])
+])
+
 # x86-specific checks
 AS_IF([test "x$ARCHTYPE" = "xx86"],[
        AC_MSG_CHECKING([if architecture really supports the mfence instruction])
@@ -104,7 +152,6 @@ AS_IF([test "x$ARCHTYPE" = "xx86"],[
 AC_MSG_CHECKING([for sys_futex()])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
                #include <sys/syscall.h>
-       ]],[[
                #ifndef __NR_futex
                #error "futexes not available"
                #endif
@@ -118,8 +165,18 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
        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.])]
+       )]
+)
+
 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"])
 
 # smp-support configure option
 AC_ARG_ENABLE([smp-support], 
@@ -161,6 +218,49 @@ AS_IF([test "x$def_smp_support" = "xyes"], [AC_DEFINE([CONFIG_RCU_SMP], [1])])
 saved_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
+AC_CHECK_TYPES([cpu_set_t],
+       [have_cpu_set_t="yes"],
+       [have_cpu_set_t="no"],
+       [#include <sched.h>])
+
+# Confirm that we have CPU_ZERO, and it actually works.
+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()
+               {
+                       cpu_set_t foo; CPU_ZERO(&foo);
+                       return 0;
+               }
+       ]])
+],[
+       AC_DEFINE(HAVE_CPU_ZERO, 1)
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+
+# Confirm that we have CPU_SET, and it actually works.
+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()
+               {
+                       cpu_set_t foo, mask; CPU_SET(0, &foo);
+                       return 0;
+               }
+       ]])
+],[
+       AC_DEFINE(HAVE_CPU_SET, 1)
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+
 # First check if the function is available at all.
 AC_CHECK_FUNCS([sched_setaffinity],[
        # Okay, we have it.  Check if also have cpu_set_t.  If we don't,
@@ -169,44 +269,31 @@ AC_CHECK_FUNCS([sched_setaffinity],[
        # version with 2 or 3 arguments.  In that case, CPU_ZERO, etc.,
        # should also be present, but we confirm nonetheless.
 
-       AC_CHECK_TYPES([cpu_set_t],[
-               # We do have it.  Confirm that we have CPU_ZERO, and it actually works.
-               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>
-                       ]],[[
-                               cpu_set_t foo; CPU_ZERO (&foo);
-                       ]])
-               ],[
-                       # Works!
-                       AC_DEFINE(HAVE_CPU_ZERO, 1)
-                       AC_MSG_RESULT([yes])
-               ],[
-                       AC_MSG_RESULT([no])
-               ])
-
+       AS_IF([test "x$have_cpu_set_t" = "xyes"], [
+               # We do have it.
                # Check how many arguments does sched_setaffinity take.
                # Should be 3 or 2.
                AC_MSG_CHECKING([how many arguments sched_setaffinity takes])
                AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
                                #include <sched.h>
-                       ]],[[
-                               cpu_set_t foo;
-                               sched_setaffinity (0, sizeof (foo), &foo);
+                               int main()
+                               {
+                                       cpu_set_t foo;
+                                       sched_setaffinity(0, sizeof (foo), &foo);
+                                       return 0;
+                               }
                        ]])
                ],
                [sched_set_affinity_args=3],
                [sched_set_affinity_args=2])
-               AC_DEFINE_UNQUOTED(SCHED_SETAFFINITY_ARGS, $sched_set_affinity_args,
+               AC_DEFINE_UNQUOTED(SCHED_SETAFFINITY_ARGS,
+                       $sched_set_affinity_args,
                        [Defined to sched_setaffinity's number of arguments.])
                AC_MSG_RESULT([$sched_set_affinity_args])
        ],[
                # No cpu_set_t, always 3 args.
                AC_DEFINE(SCHED_SETAFFINITY_ARGS, 3)
-       ],
-       [#include <sched.h>])
+       ])
 ])
 
 CFLAGS=$saved_CFLAGS
@@ -217,7 +304,13 @@ AC_CONFIG_LINKS([
 ])
 AC_CONFIG_FILES([
        Makefile
+       doc/Makefile
+       doc/examples/Makefile
        tests/Makefile
+       tests/common/Makefile
+       tests/unit/Makefile
+       tests/benchmark/Makefile
+       tests/regression/Makefile
        liburcu.pc
        liburcu-bp.pc
        liburcu-cds.pc
@@ -233,3 +326,9 @@ AS_IF([test "x$def_smp_support" = "xyes"],[
 ],[
        AS_ECHO("SMP support disabled.")
 ])
+
+AS_IF([test "x$def_tls_detect" = "x"],[
+       AS_ECHO("Thread Local Storage (TLS): pthread_getspecific().")
+],[
+       AS_ECHO("Thread Local Storage (TLS): $def_tls_detect.")
+])
This page took 0.026107 seconds and 4 git commands to generate.