X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=f026c6d60ffa44156abec1a633c6289779a151ea;hp=70e8e01b7a687275a23e41c32d6735eda1adfdfe;hb=835b9ab3ca3777fe42e37e92096226ebd19ca75b;hpb=86bc2ad861ba2a9108b83074f99698269799038e diff --git a/configure.ac b/configure.ac index 70e8e01..f026c6d 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ 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], urcu_version_major[.]urcu_version_minor[.]urcu_version_patch[]urcu_version_dev_stage) @@ -14,9 +14,9 @@ m4_define([urcu_version], urcu_version_major[.]urcu_version_minor[.]urcu_version # Library version information of "liburcu" # Following the numbering scheme proposed by libtool for the library version # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -m4_define([urcu_lib_version_current], [7]) +m4_define([urcu_lib_version_current], [8]) m4_define([urcu_lib_version_revision], [0]) -m4_define([urcu_lib_version_age], [1]) +m4_define([urcu_lib_version_age], [0]) m4_define([urcu_lib_version], urcu_lib_version_current[:]urcu_lib_version_revision[:]urcu_lib_version_age) @@ -79,11 +79,6 @@ AS_IF([test "x$ax_cv___attribute__" != "xyes"], # 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 @@ -96,6 +91,39 @@ 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 ## @@ -118,7 +146,7 @@ AC_PROG_AWK AC_PROG_GREP AC_PROG_MAKE_SET AC_CHECK_PROGS(NPROC, [nproc gnproc]) -AC_CHECK_PROG(GETCONF, [getconf]) +AC_CHECK_PROGS(GETCONF, [getconf]) AS_IF([test "x$NPROC" != "x"], [NPROC_CMD=$NPROC], [AS_IF([test "x$GETCONF" != "x"], @@ -149,6 +177,7 @@ AC_CHECK_FUNCS([ \ munmap \ rand_r \ sched_getcpu \ + sched_setaffinity \ strerror \ strtoul \ sysconf \ @@ -219,113 +248,14 @@ 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.]) ]) -AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS" - -AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"]) - - - -# 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 ]) - -# 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 - 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 - 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]) -]) +## ## +## 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])) -# 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 - 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) - ]) -]) ## ## ## Substitute variables for use in Makefile.am ## @@ -336,16 +266,25 @@ 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 $AM_CFLAGS" +AM_CFLAGS="$WARN_CFLAGS $PTHREAD_CFLAGS" AC_SUBST(AM_CFLAGS) + +## ## +## Output files generated by configure ## +## ## + AC_CONFIG_FILES([ Makefile doc/Makefile doc/examples/Makefile + extras/Makefile include/Makefile src/Makefile tests/Makefile