Update gitignore

[urcu.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6b8a35a992aa4f28aae9d354365e976370619c80..5a900087f2dfece9365de4697e0e279c96b887c7 100644 (file)
--- 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.5.4], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([userspace-rcu],[0.6.7],[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
@@ -25,7 +30,7 @@ AH_TEMPLATE([CONFIG_RCU_ARM_HAVE_DMB], [Use the dmb instruction is available for
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+LT_INIT
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -43,6 +48,7 @@ case $host_cpu in
        i486) ARCHTYPE="x86";;
        i586) ARCHTYPE="x86";;
        i686) ARCHTYPE="x86";;
+       amd64) ARCHTYPE="x86";;
        x86_64) ARCHTYPE="x86";;
        powerpc) ARCHTYPE="ppc" ;;
        ppc64) ARCHTYPE="ppc" ;;
@@ -59,30 +65,21 @@ esac
 
 if test "x$ARCHTYPE" = "xarm" ; then
 AC_MSG_CHECKING([checking for dmb instruction])
-AC_TRY_COMPILE(
-[
-],
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+]], [[
 asm volatile("dmb":::"memory");
-],
-[
+]])],[
        AC_MSG_RESULT([yes])
        AC_DEFINE([CONFIG_RCU_ARM_HAVE_DMB], [1])
-]
-,
-[
+
+],[
        AC_MSG_RESULT([no])
-]
-)
-fi
 
-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
+])
 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
@@ -103,26 +100,22 @@ fi
 ]
 
 AC_MSG_CHECKING([sys_futex()])
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/syscall.h>
-],
-[
+]], [[
 #ifndef __NR_futex
 #error "futexes not available"
 #endif
-],
-[
+]])],[
        AC_MSG_RESULT([yes])
        AC_DEFINE([CONFIG_RCU_HAVE_FUTEX], [1])
        compat_futex_test=0
-]
-,
-[
+
+],[
        AC_MSG_RESULT([no])
        compat_futex_test=1
-]
-)
+
+])
 
 AM_CONDITIONAL([COMPAT_FUTEX], [ test "x$compat_futex_test" = "x1" ])
 
@@ -235,12 +228,12 @@ 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