X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=c4bd10a78cbff1ac55b744cb169ebe5658f9e5da;hp=9b1d409204f81d38a4b174e2e0d4e7291c43e7bf;hb=1f689e13ea7e519b1afc001e9c55a7b1b60b599f;hpb=e90ad78457151a8faec9d77934b292f458082386

diff --git a/configure.ac b/configure.ac
index 9b1d409..c4bd10a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,12 @@
 # Process this file with autoconf to produce a configure script.
 
 
-AC_INIT([userspace-rcu], [0.4.6], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([userspace-rcu], [0.6.4], [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_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -20,6 +25,7 @@ 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 is available for use on ARM.])
 
 # Checks for programs.
 AC_PROG_CC
@@ -34,7 +40,7 @@ AC_TYPE_SIZE_T
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_MMAP
-AC_CHECK_FUNCS([bzero gettimeofday munmap strtoul])
+AC_CHECK_FUNCS([bzero gettimeofday munmap sched_getcpu strtoul sysconf])
 
 # Find arch type
 case $host_cpu in
@@ -52,17 +58,31 @@ case $host_cpu in
 	sparc64) ARCHTYPE="sparc64" ;;
 	alpha*) ARCHTYPE="alpha" ;;
 	ia64) ARCHTYPE="gcc" ;;
-	armv7l) ARCHTYPE="armv7l" ;;
+	arm*) ARCHTYPE="arm" ;;
 	*) ARCHTYPE="unknown";;
 esac
 
-UATOMICSRC=urcu/uatomic_arch_$ARCHTYPE.h
-ARCHSRC=urcu/arch_$ARCHTYPE.h
-if test "x$ARCHTYPE" != xx86 -a "x$ARCHTYPE" != xppc; then
-	APISRC=tests/api_gcc.h
-else
-	APISRC=tests/api_$ARCHTYPE.h
+if test "x$ARCHTYPE" = "xarm" ; then
+AC_MSG_CHECKING([checking for dmb instruction])
+AC_TRY_COMPILE(
+[
+],
+[
+asm volatile("dmb":::"memory");
+],
+[
+	AC_MSG_RESULT([yes])
+	AC_DEFINE([CONFIG_RCU_ARM_HAVE_DMB], [1])
+]
+,
+[
+	AC_MSG_RESULT([no])
+]
+)
 fi
+
+UATOMICSRC=urcu/uatomic/$ARCHTYPE.h
+ARCHSRC=urcu/arch/$ARCHTYPE.h
 if test "$ARCHTYPE" == "armv7l"; then
 	CFLAGS="-mcpu=cortex-a9 -mtune=cortex-a9 -O"
 fi
@@ -215,11 +235,16 @@ CFLAGS=$saved_CFLAGS
 
 AC_CONFIG_LINKS([
 	urcu/arch.h:$ARCHSRC
-	urcu/uatomic_arch.h:$UATOMICSRC
-	tests/api.h:$APISRC
+	urcu/uatomic.h:$UATOMICSRC
 ])
 AC_CONFIG_FILES([
 	Makefile
 	tests/Makefile
+	liburcu-cds.pc
+	liburcu.pc
+	liburcu-bp.pc
+	liburcu-qsbr.pc
+	liburcu-mb.pc
+	liburcu-signal.pc
 ])
 AC_OUTPUT