X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=eb3aa9ca3521779498970eaad3342561b8d5999a;hb=ef6da88689ddb8623fd4dd33b8400bc3bfd61cb8;hp=cb560aa88dc0e2eed6d8d5b827d665316d106f20;hpb=1136f4540f901b884c76fe011a468f2257d30a0f;p=userspace-rcu.git

diff --git a/configure.ac b/configure.ac
index cb560aa..eb3aa9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,9 +6,9 @@ dnl Process this file with autoconf to produce a configure script.
 
 # Project version information
 m4_define([urcu_version_major], [0])
-m4_define([urcu_version_minor], [12])
+m4_define([urcu_version_minor], [13])
 m4_define([urcu_version_patch], [0])
-m4_define([urcu_version_dev_stage], [])
+m4_define([urcu_version_dev_stage], [-pre])
 m4_define([urcu_version], urcu_version_major[.]urcu_version_minor[.]urcu_version_patch[]urcu_version_dev_stage)
 
 # Library version information of "liburcu"
@@ -149,6 +149,7 @@ AC_CHECK_FUNCS([ \
 	munmap \
 	rand_r \
 	sched_getcpu \
+	sched_setaffinity \
 	strerror \
 	strtoul \
 	sysconf \
@@ -220,109 +221,6 @@ AE_IF_FEATURE_ENABLED([cds-lfht-iter-debug], [
 ])
 
 
-# From the sched_setaffinity(2)'s man page:
-# ~~~~
-# The CPU affinity system calls were introduced in Linux kernel 2.5.8.
-# The library interfaces were introduced in glibc 2.3.  Initially, the
-# glibc interfaces included a cpusetsize argument.  In glibc 2.3.3,
-# the cpuset size argument was removed, but this argument was
-# restored in glibc 2.3.4.
-# ~~~~
-
-# In addition to that, some vendors ported the system call to 2.4
-# kernels.
-
-# Furthermore, when the function first appeared, the MASK argument was
-# an unsigned long pointer, while later it was made into a cpu_set_t
-# pointer.  Systems that have the cpu_set_t version also should have
-# the CPU_ZERO, CPU_SET, etc. macros.
-
-# All this mess means we have to cater for at least 3 different
-# sched_setaffinity prototypes:
-
-# ~~~~
-#  int sched_setaffinity (pid_t pid, unsigned int len, unsigned long *mask);
-#  int sched_setaffinity (pid_t __pid, size_t __cpusetsize, const cpu_set_t *__cpuset);
-#  int sched_setaffinity (pid_t __pid, const cpu_set_t *__mask);
-# ~~~~
-
-AC_CHECK_TYPES([cpu_set_t],
-	[have_cpu_set_t="yes"],
-	[have_cpu_set_t="no"],
-	[#include <sched.h>])
-
-# Confirm that we have CPU_ZERO, and it actually works.
-AC_MSG_CHECKING([whether CPU_ZERO works])
-AH_TEMPLATE([HAVE_CPU_ZERO], [Defined to 1 if we have CPU_ZERO and it works])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-		#include <sched.h>
-		int main()
-		{
-			cpu_set_t foo; CPU_ZERO(&foo);
-			return 0;
-		}
-	]])
-],[
-	AC_DEFINE(HAVE_CPU_ZERO, 1)
-	AC_MSG_RESULT([yes])
-],[
-	AC_MSG_RESULT([no])
-])
-
-# Confirm that we have CPU_SET, and it actually works.
-AC_MSG_CHECKING([whether CPU_SET works])
-AH_TEMPLATE([HAVE_CPU_SET], [Defined to 1 if we have CPU_SET and it works])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-		#include <sched.h>
-		int main()
-		{
-			cpu_set_t foo; CPU_SET(0, &foo);
-			return 0;
-		}
-	]])
-],[
-	AC_DEFINE(HAVE_CPU_SET, 1)
-	AC_MSG_RESULT([yes])
-],[
-	AC_MSG_RESULT([no])
-])
-
-# First check if the function is available at all.
-AC_CHECK_FUNCS([sched_setaffinity],[
-	# Okay, we have it.  Check if also have cpu_set_t.  If we don't,
-	# then we have the first version using unsigned long, and no
-	# CPU_ZERO, etc. macros.  If we do have cpu_set_t, we may have the
-	# version with 2 or 3 arguments.  In that case, CPU_ZERO, etc.,
-	# should also be present, but we confirm nonetheless.
-
-	AS_IF([test "x$have_cpu_set_t" = "xyes"], [
-		# We do have it.
-		# Check how many arguments does sched_setaffinity take.
-		# Should be 3 or 2.
-		AC_MSG_CHECKING([how many arguments sched_setaffinity takes])
-		AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-				#include <sched.h>
-				int main()
-				{
-					cpu_set_t foo;
-					sched_setaffinity(0, sizeof (foo), &foo);
-					return 0;
-				}
-			]])
-		],
-		[sched_set_affinity_args=3],
-		[sched_set_affinity_args=2])
-		AC_DEFINE_UNQUOTED(SCHED_SETAFFINITY_ARGS,
-			$sched_set_affinity_args,
-			[Defined to sched_setaffinity's number of arguments.])
-		AC_MSG_RESULT([$sched_set_affinity_args])
-	],[
-		# No cpu_set_t, always 3 args.
-		AC_DEFINE(SCHED_SETAFFINITY_ARGS, 3)
-	])
-])
-
-
 ##                                                                          ##
 ## Set automake variables for optional feature conditionnals in Makefile.am ##
 ##                                                                          ##
@@ -340,12 +238,20 @@ AC_SUBST([URCU_LIBRARY_VERSION], [urcu_lib_version])
 
 AC_SUBST(LT_NO_UNDEFINED)
 
-AM_CPPFLAGS="-include config.h"
+# The order in which the include folders are searched is important.
+# The top_builddir should always be searched first in the event that a build
+# time generated file is included.
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h"
 AC_SUBST(AM_CPPFLAGS)
 
 AM_CFLAGS="-Wall -Wextra -Wno-unused-parameter $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
+
+##                                     ##
+## Output files generated by configure ##
+##                                     ##
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile