X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=6bb13b8847cfad2c30fea116f17986523a2af177;hb=f26f2f9bb496a2dc053095310ab8d42b63a3b556;hp=03be435ef7c7363be974e7ec0af3175f73ddf9ba;hpb=f574bfb4d81b26d3cfc0243868d138e33470a950;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 03be435e..6bb13b88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,10 +186,6 @@ AC_CHECK_PROGS([XMLTO], [xmlto])
 
 AM_PATH_PYTHON([2.7], [], [PYTHON=""])
 
-AX_PROG_JAVAC
-AX_PROG_JAVA
-AX_PROG_JAR
-
 # Initialize and configure libtool
 LT_INIT([disable-static])
 
@@ -361,8 +357,9 @@ argument to disable NUMA support.
 
 # The JNI interface and Java Agents require a working Java JDK
 AS_IF([AE_IS_FEATURE_ENABLED([jni-interface]) || AE_IS_FEATURE_ENABLED([java-agent-jul]) || AE_IS_FEATURE_ENABLED([java-agent-log4j])], [
-  # We detected a java compiler earlier, make sure it works
-  AX_PROG_JAVAC_WORKS
+  AX_PROG_JAVAC
+  AX_PROG_JAVA
+  AX_PROG_JAR
 
   # Get the CPPFLAGS required to build jni libaries
   AX_JNI_INCLUDE_DIR
@@ -483,6 +480,18 @@ AM_CONDITIONAL([HAVE_CXX], [test "$HAVE_CXX11" = "1"])
 AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])
 AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$ac_cv_header_linux_perf_event_h" = "xyes"])
 
+
+##                                             ##
+## Substitute variables for use in Makefile.am ##
+##                                             ##
+
+# Library versions for libtool
+AC_SUBST([LTTNG_UST_LIBRARY_VERSION], ust_lib_version)
+AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], ust_ctl_lib_version)
+
+# Major soname for python-lttngust
+AC_SUBST([LTTNG_UST_LIB_SONAME_MAJOR], [ust_lib_version_current])
+
 AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
@@ -504,58 +513,60 @@ AC_SUBST(JNI_CPPFLAGS)
 
 # List of files to be generated from '.in' templates by AC_OUTPUT
 AC_CONFIG_FILES([
-	Makefile
-	doc/Makefile
-	doc/examples/Makefile
-	doc/man/Makefile
-	include/Makefile
-	snprintf/Makefile
-	libcounter/Makefile
-	libmsgpack/Makefile
-	libringbuffer/Makefile
-	liblttng-ust-comm/Makefile
-	liblttng-ust/Makefile
-	liblttng-ust-ctl/Makefile
-	liblttng-ust-fork/Makefile
-	liblttng-ust-dl/Makefile
-	liblttng-ust-fd/Makefile
-	liblttng-ust-java/Makefile
-	liblttng-ust-java-agent/Makefile
-	liblttng-ust-java-agent/java/Makefile
-	liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
-	liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
-	liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
-	liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
-	liblttng-ust-java-agent/jni/Makefile
-	liblttng-ust-java-agent/jni/common/Makefile
-	liblttng-ust-java-agent/jni/jul/Makefile
-	liblttng-ust-java-agent/jni/log4j/Makefile
-	liblttng-ust-libc-wrapper/Makefile
-	liblttng-ust-cyg-profile/Makefile
-	liblttng-ust-python-agent/Makefile
-	python-lttngust/Makefile
-	python-lttngust/setup.py
-	python-lttngust/lttngust/__init__.py
-	tools/Makefile
-	tests/Makefile
-	tests/compile/Makefile
-	tests/compile/ctf-types/Makefile
-	tests/compile/hello.cxx/Makefile
-	tests/compile/hello/Makefile
-	tests/compile/hello-many/Makefile
-	tests/compile/same_line_tracepoint/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
-	tests/utils/Makefile
-	lttng-ust.pc
-	lttng-ust-ctl.pc
+  Makefile
+  doc/Makefile
+  doc/examples/Makefile
+  doc/man/Makefile
+  include/Makefile
+  snprintf/Makefile
+  libcounter/Makefile
+  libmsgpack/Makefile
+  libringbuffer/Makefile
+  liblttng-ust-comm/Makefile
+  liblttng-ust/Makefile
+  liblttng-ust-ctl/Makefile
+  liblttng-ust-fork/Makefile
+  liblttng-ust-dl/Makefile
+  liblttng-ust-fd/Makefile
+  liblttng-ust-java/Makefile
+  liblttng-ust-java-agent/Makefile
+  liblttng-ust-java-agent/java/Makefile
+  liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
+  liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
+  liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
+  liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
+  liblttng-ust-java-agent/jni/Makefile
+  liblttng-ust-java-agent/jni/common/Makefile
+  liblttng-ust-java-agent/jni/jul/Makefile
+  liblttng-ust-java-agent/jni/log4j/Makefile
+  liblttng-ust-libc-wrapper/Makefile
+  liblttng-ust-cyg-profile/Makefile
+  liblttng-ust-python-agent/Makefile
+  python-lttngust/Makefile
+  python-lttngust/setup.py
+  python-lttngust/lttngust/version.py
+  tools/Makefile
+  tests/Makefile
+  tests/compile/Makefile
+  tests/compile/ctf-types/Makefile
+  tests/compile/hello.cxx/Makefile
+  tests/compile/hello/Makefile
+  tests/compile/hello-many/Makefile
+  tests/compile/same_line_tracepoint/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
+  tests/unit/ust-error/Makefile
+  tests/unit/ust-utils/Makefile
+  tests/utils/Makefile
+  lttng-ust.pc
+  lttng-ust-ctl.pc
 ])
 
 AC_OUTPUT
@@ -677,3 +688,5 @@ their sources.
 Use --disable-man-pages to completely disable building and installing
 the man pages.])
 ])
+
+# vim: shiftwidth=2 softtabstop=2 expandtab