X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=10b669142d2e2750c2621db5a1dc2e0c92861e98;hb=476037d9a24fdd5e339e3565743aadb9cb8a0a96;hp=927bae362c83de329c35c1a2904dcba483d138a0;hpb=17d668bb60ee196758d0e768538fdbe4039b9d28;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 927bae36..10b66914 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,14 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[1.9.1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[1.9.5],[mathieu dot desnoyers at efficios dot com])
+
+# 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([LTTNG_UST_LIBRARY_VERSION], [0:0:0])
+# note: remember to update tracepoint.h dlopen() to match this version
+# number. TODO: eventually automate by exporting the major number.
+
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -78,9 +85,8 @@ AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urc
 This error can also occur when the liburcu package's configure script has not been run.])])
 
 AC_MSG_CHECKING([caa_likely()])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <urcu/compiler.h>
-]], [[
 void fct(void)
 {
 	if (caa_likely(1)) {
@@ -149,8 +155,7 @@ AC_MSG_RESULT($LIBFORMAT)
 
 if test "x$host_cpu" = "xarm" ; then
 AC_MSG_CHECKING([checking for armv5])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-]], [[
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #ifndef __ARM_ARCH_5TEJ__
 #error "no arm5 here"
 #endif
@@ -229,9 +234,10 @@ AC_CONFIG_FILES([
 	liblttng-ust-ctl/Makefile
 	liblttng-ust-fork/Makefile
 	liblttng-ust-java/Makefile
-	liblttng-ust-libc/Makefile
+	liblttng-ust-libc-wrapper/Makefile
 	tests/Makefile
 	tests/hello/Makefile
+	tests/hello-static-lib/Makefile
 	tests/hello.cxx/Makefile
 	tests/demo/Makefile
 	tests/fork/Makefile