Fix: LTTng-UST java jni wrapper does not build with OpenJDK

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 454664f9c32811e80c7ea178029b338063a9b7b1..5c646cb053ca8c5d6cda85d5fd2d6d1b75fad7fd 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.6],[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
@@ -202,7 +207,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
@@ -223,9 +227,6 @@ AC_CONFIG_FILES([
        Makefile
        include/Makefile
        include/lttng/ust-version.h
-       doc/Makefile
-       doc/man/Makefile
-       doc/info/Makefile
        snprintf/Makefile
        libringbuffer/Makefile
        liblttng-ust-comm/Makefile
@@ -233,8 +234,10 @@ AC_CONFIG_FILES([
        liblttng-ust-ctl/Makefile
        liblttng-ust-fork/Makefile
        liblttng-ust-java/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