configure.ac: Use AC_LANG_SOURCE for if else macros

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 56cc5e46feb79d113bb4ac7353b2967c5fa667b5..3bc9964bbd4a8b4d34936f864d543afd834d5e5b 100644 (file)
--- 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.0],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[1.9.4],[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,7 +85,7 @@ 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)
@@ -149,7 +156,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"
@@ -202,7 +209,6 @@ Use the --with-java-jdk=DIR flag to point to your Java include files, or disable
 AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
 
 #currently disabled.
-       #liblttng-ust-malloc/Makefile
        #tests/hello2/Makefile
        #tests/basic/Makefile
        #tests/simple_include/Makefile
@@ -230,6 +236,7 @@ AC_CONFIG_FILES([
        liblttng-ust-ctl/Makefile
        liblttng-ust-fork/Makefile
        liblttng-ust-java/Makefile
+       liblttng-ust-libc/Makefile
        tests/Makefile
        tests/hello/Makefile
        tests/hello.cxx/Makefile