X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=9bb763d27600c0b0d9dde9f8068ac7d191819117;hp=e7cc18106a2a4f2ce5f9024118ebda835c975c53;hb=bf9de1b724767a7b0d9f32385ed3ab8623aabb71;hpb=c96a37267efd57cddf7a30f472f9e56f2ecddddc

diff --git a/configure.ac b/configure.ac
index e7cc181..9bb763d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,18 +2,22 @@
 # Process this file with autoconf to produce a configure script.
 
 
-AC_INIT([userspace-rcu], [0.2.3-alpha], [mathieu dot desnoyers at polymtl dot ca])
+AC_INIT([userspace-rcu], [0.2.3], [mathieu dot desnoyers at polymtl dot ca])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AC_CONFIG_SRCDIR([urcu.h])
+AM_PROG_MKDIR_P
 
-AH_TEMPLATE([CONFIG_SMP], [Enable SMP support. With SMP support enabled, uniprocessors are also supported. With SMP support disabled, UP systems work fine, but the behavior of SMP systems is undefined.])
-AH_TEMPLATE([CONFIG_HAVE_FENCE], [Defined when on a system that has memory fence
-instructions.])
-AH_TEMPLATE([CONFIG_HAVE_FUTEX], [Defined when on a system with futex support.])
-AC_CONFIG_HEADERS([urcu/config.h])
+AC_CONFIG_HEADERS([config.h urcu/config.h])
+
+# Keep at the end to do not pollute installed header.
+AH_TEMPLATE([CONFIG_URCU_SMP], [Enable SMP support. With SMP support enabled, uniprocessors are also supported. With SMP support disabled, UP systems work fine, but the behavior of SMP systems is undefined.])
+AH_TEMPLATE([CONFIG_URCU_HAVE_FENCE], [Defined when on a system that has memory fence instructions.])
+AH_TEMPLATE([CONFIG_URCU_HAVE_FUTEX], [Defined when on a system with futex support.])
+AH_TEMPLATE([CONFIG_URCU_COMPAT_ARCH], [Compatibility mode for i386 which lacks
+cmpxchg instruction.])
 
 # Checks for programs.
 AC_PROG_CC
@@ -33,9 +37,9 @@ AC_CHECK_FUNCS([bzero gettimeofday munmap strtoul])
 # Find arch type
 case $target_cpu in
 	i386) ARCHTYPE="x86"; SUBARCHTYPE="x86compat" ;;
-	i486) ARCHTYPE="x86"; SUBARCHTYPE="x86compat" ;;
-	i586) ARCHTYPE="x86"; SUBARCHTYPE="x86compat" ;;
-	i686) ARCHTYPE="x86"; SUBARCHTYPE="x86compat" ;;
+	i486) ARCHTYPE="x86";;
+	i586) ARCHTYPE="x86";;
+	i686) ARCHTYPE="x86";;
 	x86_64) ARCHTYPE="x86";;
 	powerpc) ARCHTYPE="ppc" ;;
 	ppc64) ARCHTYPE="ppc" ;;
@@ -53,14 +57,18 @@ AC_SUBST(ARCHTYPE)
 AC_SUBST(SUBARCHTYPE)
 
 [
-if test "x$ARCHTYPE" = "xx86" -a "x$target_cpu" != "xi386" -a "x$target_cpu" != "xi486" -a "x$target_cpu" != "xi586"; then
+#if test "x$ARCHTYPE" = "xx86" -a "x$target_cpu" != "xi386" -a "x$target_cpu" != "xi486" -a "x$target_cpu" != "xi586"; then
+#For now, using lock; addl compatibility mode even for i686, because the
+#Pentium III is seen as a i686, but lacks mfence instruction.
+#Only using fence for x86_64.
+if test "x$ARCHTYPE" = "xx86" -a "x$target_cpu" != "xi386" -a "x$target_cpu" != "xi486" -a "x$target_cpu" != "xi586" -a "x$target_cpu" != "xi686"; then
 ]
-	AC_DEFINE([CONFIG_HAVE_FENCE], [1])
+	AC_DEFINE([CONFIG_URCU_HAVE_FENCE], [1])
 [
 fi
 ]
 
-AC_MSG_CHECKING([presence of sys_futex()])
+AC_MSG_CHECKING([sys_futex()])
 AC_TRY_COMPILE(
 [
 #include <sys/syscall.h>
@@ -72,7 +80,7 @@ AC_TRY_COMPILE(
 ],
 [
 	AC_MSG_RESULT([yes])
-	AC_DEFINE([CONFIG_HAVE_FUTEX], [1])
+	AC_DEFINE([CONFIG_URCU_HAVE_FUTEX], [1])
 	compat_futex_test=0
 ]
 ,
@@ -88,6 +96,14 @@ AM_CONDITIONAL([GCC_API], [test "x$ARCHTYPE" != xx86 -a "x$ARCHTYPE" != xppc])
 
 AM_CONDITIONAL([COMPAT_ARCH], [test "x$SUBARCHTYPE" = xx86compat ])
 
+[
+if test "x$SUBARCHTYPE" = xx86compat; then
+]
+	AC_DEFINE([CONFIG_URCU_COMPAT_ARCH], [1])
+[
+fi
+]
+
 AC_ARG_ENABLE([smp-support], [  --disable-smp-support   Disable SMP support. Warning: only use this
                           on uniprocessor systems. [[default=enabled]]], [def_smp_support=$enableval], [def_smp_support="yes"])
 
@@ -96,7 +112,7 @@ if test "$def_smp_support" = "no"; then
 	echo "SMP support disabled."
 else
 ]
-	AC_DEFINE([CONFIG_SMP], [1])
+	AC_DEFINE([CONFIG_URCU_SMP], [1])
 [
 	echo "SMP support enabled."
 fi