X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=6ca038c0fa784f037454debd01c1bd482fc0e170;hb=288b842166255327245cb4e8a05ea34b79504e04;hp=ab1c4db1bc3b44ffc91785dd91226f69fd286ce4;hpb=acdb423b07f25683566023aaeb9b428b27f45910;p=urcu.git

diff --git a/configure.ac b/configure.ac
index ab1c4db..6ca038c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 AC_PREREQ(2.59)
-AC_INIT([userspace-rcu],[0.9.2],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
+AC_INIT([userspace-rcu],[0.9.7],[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], [4:0:1])
+AC_SUBST([URCU_LIBRARY_VERSION], [5:0:1])
 
 AC_CONFIG_SRCDIR([urcu.h])
 AC_CONFIG_HEADERS([config.h urcu/config.h])
@@ -33,14 +33,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
@@ -80,12 +73,10 @@ 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"
+
+AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
 
 # Checks for library functions.
-AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_FUNC_FORK
 AC_CHECK_FUNCS([ \
@@ -102,6 +93,9 @@ AC_CHECK_FUNCS([ \
 	sysconf \
 ])
 
+# AC_FUNC_MALLOC causes problems when cross-compiling.
+#AC_FUNC_MALLOC
+
 # Check for headers
 AC_HEADER_STDBOOL
 AC_CHECK_HEADERS([ \
@@ -160,7 +154,7 @@ AS_IF([test "x$SUBARCHTYPE" = xx86compat],[
 ])
 
 AS_IF([test "$host_cpu" = "armv7l"],[
-	CFLAGS="$CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
+	AM_CFLAGS="$AM_CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
 ])
 
 # ARM-specific checks
@@ -285,8 +279,8 @@ AS_IF([test "x$def_smp_support" = "xyes"], [AC_DEFINE([CONFIG_RCU_SMP], [1])])
 # 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"
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $AM_CFLAGS -D_GNU_SOURCE"
 
 AC_CHECK_TYPES([cpu_set_t],
 	[have_cpu_set_t="yes"],
@@ -367,6 +361,7 @@ AC_CHECK_FUNCS([sched_setaffinity],[
 ])
 
 CFLAGS=$saved_CFLAGS
+AC_SUBST(AM_CFLAGS)
 
 AC_CONFIG_LINKS([
 	urcu/arch.h:$ARCHSRC
@@ -399,8 +394,8 @@ 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_IF([test "x$def_compiler_tls" = "xyes"],[
+	AS_ECHO("Thread Local Storage (TLS): compiler TLS.")
 ],[
-	AS_ECHO("Thread Local Storage (TLS): $def_tls_detect.")
+	AS_ECHO("Thread Local Storage (TLS): pthread_getspecific().")
 ])