X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=ea57e7e0c04f256e087377c060504c84b4fa91e4;hp=fe1c55da3e2fa77ad78c817f84c9f37e65cb457c;hb=a59f39055b5ecb77b68cf78b9839aa9e8e4ec332;hpb=d1c678425415ed986d0101d5d9ab228b160b2fc3

diff --git a/configure.ac b/configure.ac
index fe1c55d..ea57e7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([userspace-rcu],[0.9.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], [4:0:0])
+AC_SUBST([URCU_LIBRARY_VERSION], [5:0:1])
 
 AC_CONFIG_SRCDIR([urcu.h])
 AC_CONFIG_HEADERS([config.h urcu/config.h])
@@ -25,6 +25,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],
@@ -50,6 +51,16 @@ AC_PROG_CC_STDC
 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.
@@ -129,9 +140,9 @@ AS_CASE([$host_cpu],
 	[ARCHTYPE="unknown"]
 )
 
-AS_CASE([$host],[*-*-linux-androideabi],
-	[AM_CONDITIONAL(TARGET_IS_ANDROID, true)],
-	[AM_CONDITIONAL(TARGET_IS_ANDROID, false)]
+AS_CASE([$host],[*-cygwin*],
+	[AM_CONDITIONAL(USE_CYGWIN, true)],
+	[AM_CONDITIONAL(USE_CYGWIN, false)]
 )
 
 AC_SUBST(ARCHTYPE)
@@ -216,18 +227,9 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 ])
 
 # Search for clock_gettime
-AC_SEARCH_LIBS([clock_gettime], [rt], [],
-	[AC_MSG_ERROR([Cannot find clock_gettime function.])]
-)
-
-# 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.])]
-	)]
-)
+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"])