configure: standardize automake conditional names

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7fc4fd48d56a60d10e50ac11eafea0bb4f8cf227..9d362f42bc78e64b2123058ffeee285ef96de8f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,28 +13,25 @@ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
                liblttng-ust-cyg-profile \
                tools
 
-if HAVE_DLINFO
+if ENABLE_UST_DL
 SUBDIRS += liblttng-ust-dl
 endif
 
-if BUILD_JNI_INTERFACE
+if ENABLE_JNI_INTERFACE
 SUBDIRS += liblttng-ust-java
 endif
 
-if BUILD_JAVA_AGENT
+if ENABLE_JAVA_AGENT
 SUBDIRS += liblttng-ust-java-agent
 endif
 
-if BUILD_PYTHON_AGENT
+if ENABLE_PYTHON_AGENT
 SUBDIRS += python-lttngust \
                liblttng-ust-python-agent
 endif
 
 SUBDIRS += tests doc
 
-#temporarily disabled
-# liblttng-ust-malloc
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc