X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=707c06e367fd43e88e06ae99c37033285c27c013;hb=f075cb10501787e3858f7acaa5fe08a5befee4f5;hp=e7cc18106a2a4f2ce5f9024118ebda835c975c53;hpb=c96a37267efd57cddf7a30f472f9e56f2ecddddc;p=urcu.git

diff --git a/configure.ac b/configure.ac
index e7cc181..707c06e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,12 +8,15 @@ AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AC_CONFIG_SRCDIR([urcu.h])
+AC_PROG_MKDIR_P
+AC_CONFIG_MACRO_DIR([m4])
 
-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.])
 
 # Checks for programs.
 AC_PROG_CC
@@ -53,14 +56,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 +79,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
 ]
 ,
@@ -96,7 +103,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