projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 0.9.5
[urcu.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index ae75a3be66f9ec8309f46a6cdb7ed483e83356ad..89df62d9dd7125a8526ed5c8dbc3a50ba47552f3 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.
2
],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
+AC_INIT([userspace-rcu],[0.9.
5
],[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])
@@
-51,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.
@@
-70,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([ \
@@
-92,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([ \
@@
-150,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
@@
-275,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"],
@@
-357,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.024446 seconds
and
4
git commands to generate.