X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=89b34ae7313ef0b183a625cc2692bd22902ec423;hp=ff5a57ea8d8de2601eeb23e4a7604092feff035a;hb=ee334e481cf5b4216bc61a8b291c9b944c3b4f86;hpb=afb6113ffba9d494ec90d773aed3e83acd299473

diff --git a/configure.ac b/configure.ac
index ff5a57e..89b34ae 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"
@@ -45,38 +45,110 @@ AM_MAINTAINER_MODE([enable])
 # Enable silent rules by default
 AM_SILENT_RULES([yes])
 
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
-
-AH_TEMPLATE([CONFIG_RCU_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_RCU_TLS], [TLS provided by the compiler.])
-AH_TEMPLATE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [clock_gettime() is detected.])
-AH_TEMPLATE([CONFIG_RCU_FORCE_SYS_MEMBARRIER], [Require the operating system to support the membarrier system call for default and bulletproof flavors.])
-AH_TEMPLATE([CONFIG_RCU_DEBUG], [Enable internal debugging self-checks. Introduces a performance penalty.])
-AH_TEMPLATE([CONFIG_CDS_LFHT_ITER_DEBUG], [Enable extra debugging checks for lock-free hash table iterator traversal. Alters the rculfhash ABI. Make sure to compile both library and application with matching configuration.])
-
-# Allow requiring the operating system to support the membarrier system
-# call. Applies to default and bulletproof flavors.
-AC_ARG_ENABLE([sys-membarrier-fallback],
-	AS_HELP_STRING([--disable-sys-membarrier-fallback], [Abort if sys-membarrier is needed but not available rather than using a fallback.]),
-	[def_sys_membarrier_fallback=$enableval],
-	[def_sys_membarrier_fallback="yes"])
-AS_IF([test "x$def_sys_membarrier_fallback" != "xyes"], [AC_DEFINE([CONFIG_RCU_FORCE_SYS_MEMBARRIER], [1])])
-
-# Allow overriding storage used for TLS variables.
-AC_ARG_ENABLE([compiler-tls],
-	AS_HELP_STRING([--disable-compiler-tls], [Use pthread_getspecific() to emulate Thread Local Storage (TLS) variables.]),
-	[def_compiler_tls=$enableval],
-	[def_compiler_tls="yes"])
-
-# Checks for C compiler
-AC_USE_SYSTEM_EXTENSIONS
+
+##                               ##
+## OS and Arch specific defaults ##
+##                               ##
+
+AS_CASE([$host],
+  [*-cygwin*], [LT_NO_UNDEFINED="-no-undefined"]
+)
+
+
+##                   ##
+## C compiler checks ##
+##                   ##
+
+# Choose the C compiler
 AC_PROG_CC
 # AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70
 m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
-AS_IF([test "x$def_compiler_tls" = "xyes"], AC_DEFINE([CONFIG_RCU_TLS], [1]), [:])
 
-# Checks for programs.
+# Make sure the C compiler supports C99
+AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([The compiler does not support C99])])
+
+# Enable available system extensions and LFS support
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
+
+# Make sure the C compiler supports __attribute__
+AX_C___ATTRIBUTE__
+AS_IF([test "x$ax_cv___attribute__" != "xyes"],
+  [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
+
+# Make sure we have pthread support
+AX_PTHREAD([], [AC_MSG_ERROR([Could not configure pthread support])])
+
+# Make sure the C compiler supports weak symbols
+AX_SYS_WEAK_ALIAS
+AS_IF([test "x$ax_cv_sys_weak_alias" = "xno"],
+  [AC_MSG_ERROR([Your platform doesn't support weak symbols.])])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_INLINE
+AC_C_TYPEOF
+AC_TYPE_INT32_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_UINT8_T
+
+# Detect warning flags supported by the C compiler and append them to
+# WARN_CFLAGS.
+m4_define([WARN_FLAGS_LIST], [ dnl
+  -Wall dnl
+  -Wextra dnl
+  -Wmissing-prototypes dnl
+  -Wmissing-declarations dnl
+  -Wnull-dereference dnl
+  -Wundef dnl
+  -Wshadow dnl
+  -Wjump-misses-init dnl
+  -Wsuggest-attribute=format dnl
+  -Wtautological-constant-out-of-range-compare dnl
+  -Wnested-externs dnl
+  -Wwrite-strings dnl
+  -Wformat=2 dnl
+  -Wstrict-aliasing dnl
+  -Wmissing-noreturn dnl
+  -Winit-self dnl
+  -Wduplicated-cond dnl
+  -Wduplicated-branches dnl
+  -Wlogical-op dnl
+  dnl
+  dnl-Wredundant-decls dnl
+  -Wno-null-dereference dnl
+])
+
+# Pass -Werror as an extra flag during the test: this is needed to make the
+# -Wunknown-warning-option diagnostic fatal with clang.
+AC_LANG_PUSH([C])
+AX_APPEND_COMPILE_FLAGS([WARN_FLAGS_LIST], [WARN_CFLAGS], [-Werror])
+AC_LANG_POP([C])
+
+
+##               ##
+## Header checks ##
+##               ##
+
+AC_HEADER_STDBOOL
+AC_CHECK_HEADERS([ \
+	limits.h \
+	stddef.h \
+	sys/param.h \
+	sys/time.h \
+])
+
+
+##                 ##
+## Programs checks ##
+##                 ##
+
 AC_PROG_AWK
+AC_PROG_GREP
 AC_PROG_MAKE_SET
 AC_CHECK_PROGS(NPROC, [nproc gnproc])
 AC_CHECK_PROGS(GETCONF, [getconf])
@@ -89,27 +161,13 @@ AS_IF([test "x$NPROC" != "x"],
 )
 AC_SUBST([NPROC_CMD], [$NPROC_CMD])
 
+# Initialize and configure libtool
 LT_INIT
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_INT32_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_UINT8_T
-
-AX_C___ATTRIBUTE__
-AS_IF([test "x$ax_cv___attribute__" = "xyes"],
-	[:],
-	[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
-
-AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
 
-AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
+##                ##
+## Library checks ##
+##                ##
 
 # Checks for library functions.
 AC_FUNC_MMAP
@@ -124,6 +182,7 @@ AC_CHECK_FUNCS([ \
 	munmap \
 	rand_r \
 	sched_getcpu \
+	sched_setaffinity \
 	strerror \
 	strtoul \
 	sysconf \
@@ -132,152 +191,77 @@ AC_CHECK_FUNCS([ \
 # AC_FUNC_MALLOC causes problems when cross-compiling.
 #AC_FUNC_MALLOC
 
-# Check for headers
-AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([ \
-	limits.h \
-	stddef.h \
-	sys/param.h \
-	sys/time.h \
+# Search for clock_gettime() in -lrt
+AC_SEARCH_LIBS([clock_gettime], [rt], [
+  AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1], [clock_gettime() is detected.])
 ])
 
-AS_CASE([$host],[*-cygwin*],
-	[AM_CONDITIONAL(USE_CYGWIN, true)],
-	[AM_CONDITIONAL(USE_CYGWIN, false)]
-)
 
-# Search for clock_gettime
-AC_SEARCH_LIBS([clock_gettime], [rt], [
-	AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1])
-	config_rcu_have_clock_gettime=yes
-], [])
+##                              ##
+## Optionnal features selection ##
+##                              ##
 
-AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"])
+# Allow to fallback to FIXME if the membarrier syscall is unavailable on the
+# running kernel, when disabled, abort if the syscall is unavailable. Applies
+# to default and bulletproof flavors.
+# Enabled by default
+AE_FEATURE_DEFAULT_ENABLE
+AE_FEATURE([sys-membarrier-fallback], [Abort if sys-membarrier is needed but not available rather than using a fallback.])
+
+# Use compiler Thread Local Storage, when disabled use pthread_getspecific() to emulate TLS.
+# Enabled by default
+AE_FEATURE_DEFAULT_ENABLE
+AE_FEATURE([compiler-tls], [Use pthread_getspecific() to emulate Thread Local Storage (TLS) variables.])
 
 # smp-support configure option
-AC_ARG_ENABLE([smp-support], 
-	AS_HELP_STRING([--disable-smp-support], [Disable SMP support. Warning: only use this on uniprocessor systems. [default=enabled]]),
-	[def_smp_support=$enableval],
-	[def_smp_support="yes"])
-AS_IF([test "x$def_smp_support" = "xyes"], [AC_DEFINE([CONFIG_RCU_SMP], [1])])
+# Enabled by default
+AE_FEATURE_DEFAULT_ENABLE
+AE_FEATURE([smp-support], [Disable SMP support. Warning: only use this on uniprocessor systems.])
 
 # RCU debugging option
-AC_ARG_ENABLE([rcu-debug],
-      AS_HELP_STRING([--enable-rcu-debug], [Enable internal debugging
-		      self-checks. Introduces a performance penalty.]))
-AS_IF([test "x$enable_rcu_debug" = "xyes"], [
-       AC_DEFINE([CONFIG_RCU_DEBUG], [1])
-])
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([rcu-debug], [Enable internal debugging self-checks. Introduces a performance penalty.])
 
 # rculfhash iterator debugging
-AC_ARG_ENABLE([cds-lfht-iter-debug],
-      AS_HELP_STRING([--enable-cds-lfht-iter-debug], [Enable extra debugging checks for lock-free hash table iterator traversal. Alters the rculfhash ABI. Make sure to compile both library and application with matching configuration.]))
-AS_IF([test "x$enable_cds_lfht_iter_debug" = "xyes"], [
-       AC_DEFINE([CONFIG_CDS_LFHT_ITER_DEBUG], [1])
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([cds-lfht-iter-debug], [Enable extra debugging checks for lock-free hash table iterator traversal. Alters the rculfhash ABI. Make sure to compile both library and application with matching configuration.])
+
+
+##                                                                    ##
+## Set defines for optional features conditionnals in the source code ##
+##                                                                    ##
+
+AE_IF_FEATURE_DISABLED([sys-membarrier-fallback], [
+  AC_DEFINE([CONFIG_RCU_FORCE_SYS_MEMBARRIER], [1], [Require the operating system to support the membarrier system call for default and bulletproof flavors.])
 ])
 
-# 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])
+AE_IF_FEATURE_ENABLED([compiler-tls], [
+  AC_DEFINE([CONFIG_RCU_TLS], [1], [Use compiler provided Thread Local Storage.])
 ])
 
-# 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])
+AE_IF_FEATURE_ENABLED([smp-support], [
+  AC_DEFINE([CONFIG_RCU_SMP], [1], [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.])
 ])
 
-# 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)
-	])
+AE_IF_FEATURE_ENABLED([rcu-debug], [
+  AC_DEFINE([CONFIG_RCU_DEBUG], [1], [Enable internal debugging self-checks. Introduces a performance penalty.])
 ])
 
+AE_IF_FEATURE_ENABLED([cds-lfht-iter-debug], [
+  AC_DEFINE([CONFIG_CDS_LFHT_ITER_DEBUG], [1], [Enable extra debugging checks for lock-free hash table iterator traversal. Alters the rculfhash ABI. Make sure to compile both library and application with matching configuration.])
+])
+
+
+##                                                                          ##
+## Set automake variables for optional feature conditionnals in Makefile.am ##
+##                                                                          ##
+
+# Building the examples requires the shared libraries to be enabled
+AM_CONDITIONAL([ENABLE_EXAMPLES], AE_IS_FEATURE_ENABLED([shared]))
+
+
 ##                                             ##
 ## Substitute variables for use in Makefile.am ##
 ##                                             ##
@@ -285,12 +269,22 @@ AC_CHECK_FUNCS([sched_setaffinity],[
 # Library versions for libtool
 AC_SUBST([URCU_LIBRARY_VERSION], [urcu_lib_version])
 
-AM_CPPFLAGS="-include config.h"
+AC_SUBST(LT_NO_UNDEFINED)
+
+# 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 $AM_CFLAGS"
+AM_CFLAGS="$WARN_CFLAGS $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
+
+##                                     ##
+## Output files generated by configure ##
+##                                     ##
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
@@ -392,35 +386,35 @@ PPRINT_SUBTITLE([Features])
 PPRINT_PROP_STRING([Target architecture], $host_cpu)
 
 # SMP support enabled/disabled
-test "x$def_smp_support" = "xyes" && value=1 || value=0
+AE_IS_FEATURE_ENABLED([smp-support]) && value=1 || value=0
 PPRINT_PROP_BOOL([SMP support], $value)
 
 # TLS
-test "x$def_compiler_tls" = "xyes" && value="compiler TLS" || value="pthread_getspecific()"
+AE_IS_FEATURE_ENABLED([compiler-tls]) && value="compiler TLS" || value="pthread_getspecific()"
 PPRINT_PROP_STRING([Thread Local Storage (TLS)], [$value])
 
 # clock_gettime() available
-test "x$config_rcu_have_clock_gettime" = "xyes" && value=1 || value=0
+test "x$ac_cv_search_function_clock_gettime" != "xno" && value=1 || value=0
 PPRINT_PROP_BOOL([clock_gettime()], $value)
 
 # Require membarrier
-test "x$def_sys_membarrier_fallback" != "xyes" && value=1 || value=0
+AE_IS_FEATURE_ENABLED([sys-membarrier-fallback]) && value=0 || value=1
 PPRINT_PROP_BOOL([Require membarrier], $value)
 
 # RCU debug enabled/disabled
-test "x$enable_rcu_debug" = "xyes" && value=1 || value=0
+AE_IS_FEATURE_ENABLED([rcu-debug]) && value=1 || value=0
 PPRINT_PROP_BOOL([Internal debugging], $value)
 
 # rculfhash iterator debug enabled/disabled
-test "x$enable_cds_lfht_iter_debug" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Lock-free hash table iterator debugging], $value)
+AE_IS_FEATURE_ENABLED([cds-lfht-iter-debug]) && value=1 || value=0
+PPRINT_PROP_BOOL([Lock-free HT iterator debugging], $value)
 
 PPRINT_PROP_BOOL([Multi-flavor support], 1)
 
 report_bindir="`eval eval echo $bindir`"
 report_libdir="`eval eval echo $libdir`"
 
-# Print the bindir and libdir this `make install' will install into.
+# Print the bindir and libdir this 'make install' will install into.
 AS_ECHO
 PPRINT_SUBTITLE([Install directories])
 PPRINT_PROP_STRING([Binaries], [$report_bindir])