# Following the numbering scheme proposed by libtool for the library version
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
# This is the library version of liblttng-ust.
-m4_define([UST_LIB_V_MAJOR], [0])
+m4_define([UST_LIB_V_MAJOR], [1])
m4_define([UST_LIB_V_MINOR], [0])
m4_define([UST_LIB_V_PATCH], [0])
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
AC_PROG_CC
-AC_PROG_CC_STDC
+# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70
+m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX([11])
RW_PROG_CXX_WORKS
# Require URCU >= 0.12 for DEFINE_URCU_TLS_INIT
PKG_CHECK_MODULES([URCU], [liburcu >= 0.12])
-PKG_CHECK_MODULES([URCU_BP], [liburcu-bp >= 0.12])
-PKG_CHECK_MODULES([URCU_CDS], [liburcu-cds >= 0.12])
# numa.h integration
AS_IF([test "x$NO_NUMA" = "x1"],[
AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS"
AC_SUBST(AM_CFLAGS)
+AM_CXXFLAGS="$AM_CFLAGS"
+AC_SUBST(AM_CXXFLAGS)
+
# 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.
include/Makefile
include/lttng/ust-version.h
snprintf/Makefile
+ libcounter/Makefile
+ libmsgpack/Makefile
libringbuffer/Makefile
liblttng-ust-comm/Makefile
liblttng-ust/Makefile
tests/compile/test-app-ctx/Makefile
tests/benchmark/Makefile
tests/unit/gcc-weak-hidden/Makefile
+ tests/unit/libmsgpack/Makefile
tests/unit/Makefile
+ tests/unit/libringbuffer/Makefile
tests/unit/pthread_name/Makefile
tests/unit/snprintf/Makefile
tests/unit/ust-elf/Makefile