X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=61f02399cedc1066f09fa66d9a7984aef9616cdc;hb=f08d6c01cefc2a525712acd1fb76f4442d1ef45f;hp=89606d5bc3e36fbbd5bde74993d665a99c606275;hpb=0c8cf6a8e24cf47295bdf5d2c7f74fc56de9dab8;p=userspace-rcu.git

diff --git a/configure.ac b/configure.ac
index 89606d5..61f0239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([userspace-rcu],[0.10.0],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
+AC_INIT([userspace-rcu],[0.10.2],[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
@@ -42,14 +42,7 @@ AC_ARG_ENABLE([compiler-tls],
 	[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)])
+AS_IF([test "x$def_compiler_tls" = "xyes"], AC_DEFINE([CONFIG_RCU_TLS], [1]), [:])
 
 # Checks for C compiler
 AC_USE_SYSTEM_EXTENSIONS
@@ -428,7 +421,7 @@ test "x$compat_futex_test" = "x0" && value=1 || value=0
 PPRINT_PROP_BOOL([Futex support], $value)
 
 # TLS
-test "x$def_tls_detect" = "x" && value="pthread_getspecific()" || value="$def_tls_detect"
+test "x$def_compiler_tls" = "xyes" && value="compiler TLS" || value="pthread_getspecific()"
 PPRINT_PROP_STRING([Thread Local Storage (TLS)], [$value])
 
 # clock_gettime() available