X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-consumerd%2Flttng-consumerd.c;h=c85914e7f9b1c8a0db37ea88b8b6cee970010f95;hp=cac71cace39920f4fa0786064ea36332ccb9ef19;hb=5485f82241185e6703fe343704c48d2a6d6a4b46;hpb=3bd1e0819b577ffcb44acd7c2f8e02ff09654b7b

diff --git a/lttng-consumerd/lttng-consumerd.c b/lttng-consumerd/lttng-consumerd.c
index cac71cace..c85914e7f 100644
--- a/lttng-consumerd/lttng-consumerd.c
+++ b/lttng-consumerd/lttng-consumerd.c
@@ -139,7 +139,7 @@ static void usage(void)
 			"Consumer kernel buffers (default).\n");
 	fprintf(stderr, "  -u, --ust                          "
 			"Consumer UST buffers.%s\n",
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
+#ifdef HAVE_LIBLTTNG_UST_CTL
 			""
 #else
 			" (support not compiled in)"
@@ -163,7 +163,7 @@ static void parse_args(int argc, char **argv)
 		{ "verbose", 0, 0, 'v' },
 		{ "version", 0, 0, 'V' },
 		{ "kernel", 0, 0, 'k' },
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
+#ifdef HAVE_LIBLTTNG_UST_CTL
 		{ "ust", 0, 0, 'u' },
 #endif
 		{ NULL, 0, 0, 0 }
@@ -207,7 +207,7 @@ static void parse_args(int argc, char **argv)
 		case 'k':
 			opt_type = LTTNG_CONSUMER_KERNEL;
 			break;
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
+#ifdef HAVE_LIBLTTNG_UST_CTL
 		case 'u':
 			opt_type = LTTNG_CONSUMER_UST;
 			break;
@@ -401,12 +401,12 @@ int main(int argc, char **argv)
 		goto error;
 	}
 
-	/* Connect to the socket created by ltt-sessiond to report errors */
+	/* Connect to the socket created by lttng-sessiond to report errors */
 	DBG("Connecting to error socket %s", error_sock_path);
 	ret = lttcomm_connect_unix_sock(error_sock_path);
-	/* not a fatal error, but all communication with ltt-sessiond will fail */
+	/* not a fatal error, but all communication with lttng-sessiond will fail */
 	if (ret < 0) {
-		WARN("Cannot connect to error socket, is ltt-sessiond started ?");
+		WARN("Cannot connect to error socket, is lttng-sessiond started ?");
 	}
 	lttng_consumer_set_error_sock(ctx, ret);