projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Don't override user variables within the build system
[userspace-rcu.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index fcad176c16e6c5aac0e349a084d32cd8d146c79a..e56eb06e55d67b97f09bb44a7dbb349523a6cfd3 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,9
+1,9
@@
AC_PREREQ(2.59)
AC_PREREQ(2.59)
-AC_INIT([userspace-rcu],[0.9.
1
],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
+AC_INIT([userspace-rcu],[0.9.
3
],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
# Following the numbering scheme proposed by libtool for the library version
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
# Following the numbering scheme proposed by libtool for the library version
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([URCU_LIBRARY_VERSION], [
4:0:0
])
+AC_SUBST([URCU_LIBRARY_VERSION], [
5:0:1
])
AC_CONFIG_SRCDIR([urcu.h])
AC_CONFIG_HEADERS([config.h urcu/config.h])
AC_CONFIG_SRCDIR([urcu.h])
AC_CONFIG_HEADERS([config.h urcu/config.h])
@@
-25,6
+25,7
@@
AH_TEMPLATE([CONFIG_RCU_HAVE_FUTEX], [Defined when on a system with futex suppor
AH_TEMPLATE([CONFIG_RCU_COMPAT_ARCH], [Compatibility mode for i386 which lacks cmpxchg instruction.])
AH_TEMPLATE([CONFIG_RCU_ARM_HAVE_DMB], [Use the dmb instruction if available for use on ARM.])
AH_TEMPLATE([CONFIG_RCU_TLS], [TLS provided by the compiler.])
AH_TEMPLATE([CONFIG_RCU_COMPAT_ARCH], [Compatibility mode for i386 which lacks cmpxchg instruction.])
AH_TEMPLATE([CONFIG_RCU_ARM_HAVE_DMB], [Use the dmb instruction if available for use on ARM.])
AH_TEMPLATE([CONFIG_RCU_TLS], [TLS provided by the compiler.])
+AH_TEMPLATE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [clock_gettime() is detected.])
# Allow overriding storage used for TLS variables.
AC_ARG_ENABLE([compiler-tls],
# Allow overriding storage used for TLS variables.
AC_ARG_ENABLE([compiler-tls],
@@
-50,6
+51,16
@@
AC_PROG_CC_STDC
AC_PROG_AWK
AC_PROG_MAKE_SET
AC_CHECK_PROGS(NPROC, [nproc gnproc])
AC_PROG_AWK
AC_PROG_MAKE_SET
AC_CHECK_PROGS(NPROC, [nproc gnproc])
+AC_CHECK_PROGS(GETCONF, [getconf])
+AS_IF([test "x$NPROC" != "x"],
+ [NPROC_CMD=$NPROC],
+ [AS_IF([test "x$GETCONF" != "x"],
+ [NPROC_CMD="$GETCONF _NPROCESSORS_ONLN"],
+ [NPROC_CMD="echo 1"]
+ )]
+)
+AC_SUBST([NPROC_CMD], [$NPROC_CMD])
+
LT_INIT
# Checks for typedefs, structures, and compiler characteristics.
LT_INIT
# Checks for typedefs, structures, and compiler characteristics.
@@
-69,12
+80,10
@@
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])])
[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
+
+AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
# Checks for library functions.
# Checks for library functions.
-AC_FUNC_MALLOC
AC_FUNC_MMAP
AC_FUNC_FORK
AC_CHECK_FUNCS([ \
AC_FUNC_MMAP
AC_FUNC_FORK
AC_CHECK_FUNCS([ \
@@
-91,6
+100,9
@@
AC_CHECK_FUNCS([ \
sysconf \
])
sysconf \
])
+# AC_FUNC_MALLOC causes problems when cross-compiling.
+#AC_FUNC_MALLOC
+
# Check for headers
AC_HEADER_STDBOOL
AC_CHECK_HEADERS([ \
# Check for headers
AC_HEADER_STDBOOL
AC_CHECK_HEADERS([ \
@@
-121,7
+133,7
@@
AS_CASE([$host_cpu],
[alpha*], [ARCHTYPE="alpha"],
[ia64], [ARCHTYPE="ia64"],
[arm*], [ARCHTYPE="arm"],
[alpha*], [ARCHTYPE="alpha"],
[ia64], [ARCHTYPE="ia64"],
[arm*], [ARCHTYPE="arm"],
- [aarch64], [ARCHTYPE="aarch64"],
+ [aarch64
*
], [ARCHTYPE="aarch64"],
[mips*], [ARCHTYPE="mips"],
[tile*], [ARCHTYPE="tile"],
[hppa*], [ARCHTYPE="hppa"],
[mips*], [ARCHTYPE="mips"],
[tile*], [ARCHTYPE="tile"],
[hppa*], [ARCHTYPE="hppa"],
@@
-133,6
+145,11
@@
AS_CASE([$host],[*-*-linux-androideabi],
[AM_CONDITIONAL(TARGET_IS_ANDROID, false)]
)
[AM_CONDITIONAL(TARGET_IS_ANDROID, false)]
)
+AS_CASE([$host],[*-cygwin*],
+ [AM_CONDITIONAL(USE_CYGWIN, true)],
+ [AM_CONDITIONAL(USE_CYGWIN, false)]
+)
+
AC_SUBST(ARCHTYPE)
AC_SUBST(SUBARCHTYPE)
AC_SUBST(ARCHTYPE)
AC_SUBST(SUBARCHTYPE)
@@
-144,7
+161,7
@@
AS_IF([test "x$SUBARCHTYPE" = xx86compat],[
])
AS_IF([test "$host_cpu" = "armv7l"],[
])
AS_IF([test "$host_cpu" = "armv7l"],[
-
CFLAGS="$
CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
+
AM_CFLAGS="$AM_
CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
])
# ARM-specific checks
])
# ARM-specific checks
@@
-215,9
+232,9
@@
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
])
# Search for clock_gettime
])
# Search for clock_gettime
-AC_SEARCH_LIBS([clock_gettime], [rt], [
],
- [AC_MSG_ERROR([Cannot find clock_gettime function.])]
-)
+AC_SEARCH_LIBS([clock_gettime], [rt], [
+ AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1])
+
], []
)
# Check for pthread
AC_CHECK_LIB([pthread], [pthread_create],
# Check for pthread
AC_CHECK_LIB([pthread], [pthread_create],
@@
-269,8
+286,8
@@
AS_IF([test "x$def_smp_support" = "xyes"], [AC_DEFINE([CONFIG_RCU_SMP], [1])])
# Since we define _GNU_SOURCE in the sources, must do so too in the
# autoconf tests, as defining _GNU_SOURCE or not exposes
# sched_setaffinity bits differently.
# Since we define _GNU_SOURCE in the sources, must do so too in the
# autoconf tests, as defining _GNU_SOURCE or not exposes
# sched_setaffinity bits differently.
-saved_CFLAGS=
$CFLAGS
-CFLAGS="$CFLAGS -D_GNU_SOURCE"
+saved_CFLAGS=
"$CFLAGS"
+CFLAGS="$CFLAGS
$AM_CFLAGS
-D_GNU_SOURCE"
AC_CHECK_TYPES([cpu_set_t],
[have_cpu_set_t="yes"],
AC_CHECK_TYPES([cpu_set_t],
[have_cpu_set_t="yes"],
@@
-351,6
+368,7
@@
AC_CHECK_FUNCS([sched_setaffinity],[
])
CFLAGS=$saved_CFLAGS
])
CFLAGS=$saved_CFLAGS
+AC_SUBST(AM_CFLAGS)
AC_CONFIG_LINKS([
urcu/arch.h:$ARCHSRC
AC_CONFIG_LINKS([
urcu/arch.h:$ARCHSRC
This page took
0.024366 seconds
and
4
git commands to generate.