Python agent lib soname major bump

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4ecd250f905ea0bb1b5d9c70ac4e059628876379..5c060fb58dab142ae532b093a6eb2b355b61af04 100644 (file)
--- 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
@@ -492,6 +489,9 @@ AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$ac_cv_header_linux_perf_event_h" = "x
 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)
 
@@ -544,7 +544,7 @@ AC_CONFIG_FILES([
   liblttng-ust-python-agent/Makefile
   python-lttngust/Makefile
   python-lttngust/setup.py
-  python-lttngust/lttngust/__init__.py
+  python-lttngust/lttngust/version.py
   tools/Makefile
   tests/Makefile
   tests/compile/Makefile