X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=8eec26951e47dce19691843c4b44807c531215a5;hp=8ebfa8b50905725faf92588e0567f26b8347985b;hb=2af1c19e6a553878fcb2a5106f050d5ed7ac0f54;hpb=8be0fb5f7bbd9148b6c49e5b498742248b0eb18a

diff --git a/configure.ac b/configure.ac
index 8ebfa8b..8eec269 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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.
@@ -121,7 +132,7 @@ AS_CASE([$host_cpu],
 	[alpha*], [ARCHTYPE="alpha"],
 	[ia64], [ARCHTYPE="ia64"],
 	[arm*], [ARCHTYPE="arm"],
-	[aarch64], [ARCHTYPE="aarch64"],
+	[aarch64*], [ARCHTYPE="aarch64"],
 	[mips*], [ARCHTYPE="mips"],
 	[nios2*], [ARCHTYPE="nios2"],
 	[tile*], [ARCHTYPE="tile"],
@@ -134,6 +145,11 @@ AS_CASE([$host],[*-*-linux-androideabi],
 	[AM_CONDITIONAL(TARGET_IS_ANDROID, false)]
 )
 
+AS_CASE([$host],[*-cygwin*],
+	[AM_CONDITIONAL(USE_CYGWIN, true)],
+	[AM_CONDITIONAL(USE_CYGWIN, false)]
+)
+
 AC_SUBST(ARCHTYPE)
 AC_SUBST(SUBARCHTYPE)
 
@@ -216,9 +232,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.])]
-)
+AC_SEARCH_LIBS([clock_gettime], [rt], [
+	AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1])
+], [])
 
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create],