# 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:1])
+AC_SUBST([URCU_LIBRARY_VERSION], [5:0:1])
-AC_CONFIG_SRCDIR([urcu.h])
-AC_CONFIG_HEADERS([config.h urcu/config.h])
+AC_CONFIG_HEADERS([include/config.h include/urcu/config.h])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip nostdinc])
AM_MAINTAINER_MODE([enable])
# Enable silent rules if available (Introduced in AM 1.11)
CC="$PTHREAD_CC"
# Checks for library functions.
-AC_FUNC_MALLOC
AC_FUNC_MMAP
AC_FUNC_FORK
AC_CHECK_FUNCS([ \
sysconf \
])
+# AC_FUNC_MALLOC causes problems when cross-compiling.
+#AC_FUNC_MALLOC
+
# Check for headers
AC_HEADER_STDBOOL
AC_CHECK_HEADERS([ \
[ARCHTYPE="unknown"]
)
-AS_CASE([$host],[*-*-linux-androideabi],
- [AM_CONDITIONAL(TARGET_IS_ANDROID, true)],
- [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)
-UATOMICSRC=urcu/uatomic/$ARCHTYPE.h
-ARCHSRC=urcu/arch/$ARCHTYPE.h
+UATOMICSRC=include/urcu/uatomic/$ARCHTYPE.h
+ARCHSRC=include/urcu/arch/$ARCHTYPE.h
AS_IF([test "x$SUBARCHTYPE" = xx86compat],[
AC_DEFINE([CONFIG_RCU_COMPAT_ARCH], [1])
AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1])
], [])
-# Check for pthread
-AC_CHECK_LIB([pthread], [pthread_create],
- [AM_CONDITIONAL(LIBC_INCLUDES_PTHREAD, false)],
- [AC_CHECK_LIB([c], [pthread_create],
- [AM_CONDITIONAL(LIBC_INCLUDES_PTHREAD, true)],
- [AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
- )]
-)
-
AM_CONDITIONAL([COMPAT_FUTEX], [test "x$compat_futex_test" = "x1"])
AM_CONDITIONAL([COMPAT_ARCH], [test "x$SUBARCHTYPE" = "xx86compat"])
AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"])
# int sched_setaffinity (pid_t __pid, const cpu_set_t *__mask);
# ~~~~
-# 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"
-
AC_CHECK_TYPES([cpu_set_t],
[have_cpu_set_t="yes"],
[have_cpu_set_t="no"],
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([[
- #define _GNU_SOURCE
#include <sched.h>
int main()
{
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([[
- #define _GNU_SOURCE
#include <sched.h>
int main()
{
])
])
-CFLAGS=$saved_CFLAGS
+DEFAULT_INCLUDES="-include config.h"
+AC_SUBST(DEFAULT_INCLUDES)
AC_CONFIG_LINKS([
- urcu/arch.h:$ARCHSRC
- urcu/uatomic.h:$UATOMICSRC
+ include/urcu/arch.h:$ARCHSRC
+ include/urcu/uatomic.h:$UATOMICSRC
])
AC_CONFIG_FILES([
Makefile
doc/Makefile
doc/examples/Makefile
+ include/Makefile
+ src/Makefile
tests/Makefile
tests/common/Makefile
tests/unit/Makefile
tests/regression/Makefile
tests/regression/regression_tests
tests/utils/Makefile
- liburcu.pc
- liburcu-bp.pc
- liburcu-cds.pc
- liburcu-qsbr.pc
- liburcu-mb.pc
- liburcu-signal.pc
+ src/liburcu.pc
+ src/liburcu-bp.pc
+ src/liburcu-cds.pc
+ src/liburcu-qsbr.pc
+ src/liburcu-mb.pc
+ src/liburcu-signal.pc
])
AC_OUTPUT