diff --git a/configure.ac b/configure.ac index 732f4fe725..262e63b768 100644 --- a/configure.ac +++ b/configure.ac @@ -1378,10 +1378,10 @@ if test "$with_dtrace" != "no" ; then with_dtrace=yes fi if test "$with_dtrace" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_DTRACE], 1, [whether DTrace static probes are available]) + AC_DEFINE_UNQUOTED([WITH_DTRACE_PROBES], 1, [whether DTrace static probes are available]) fi fi -AM_CONDITIONAL([WITH_DTRACE], [test "$with_dtrace" != "no"]) +AM_CONDITIONAL([WITH_DTRACE_PROBES], [test "$with_dtrace" != "no"]) dnl NUMA lib diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e2c1357386..db4abf53fe 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -109,7 +109,7 @@ libvirtd_LDADD = \ $(SASL_LIBS) \ $(POLKIT_LIBS) -if WITH_DTRACE +if WITH_DTRACE_PROBES libvirtd_LDADD += ../src/probes.o endif diff --git a/src/Makefile.am b/src/Makefile.am index d5f52a08b6..9b1921d402 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1284,7 +1284,7 @@ libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) # picked out for us. libvirt_la_DEPENDENCIES = $(libvirt_la_BUILT_LIBADD) $(LIBVIRT_SYMBOL_FILE) -if WITH_DTRACE +if WITH_DTRACE_PROBES libvirt_la_BUILT_LIBADD += probes.o libvirt_la_DEPENDENCIES += probes.o nodist_libvirt_la_SOURCES = probes.h @@ -1521,7 +1521,7 @@ libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(RT_LIBS) \ ../gnulib/lib/libgnu.la -if WITH_DTRACE +if WITH_DTRACE_PROBES libvirt_lxc_LDADD += probes.o endif if WITH_SECDRIVER_SELINUX diff --git a/src/internal.h b/src/internal.h index fabcb52fb7..34085419cb 100644 --- a/src/internal.h +++ b/src/internal.h @@ -247,7 +247,7 @@ # define VIR_DIV_UP(value, size) (((value) + (size) - 1) / (size)) -# if WITH_DTRACE +# if WITH_DTRACE_PROBES # ifndef LIBVIRT_PROBES_H # define LIBVIRT_PROBES_H # include "probes.h" diff --git a/tests/Makefile.am b/tests/Makefile.am index 3fb9e2f29f..9974c2ffb2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,7 +29,7 @@ INCLUDES += \ endif PROBES_O = -if WITH_DTRACE +if WITH_DTRACE_PROBES PROBES_O += ../src/probes.o endif