From db438817da3583969d9fb907aee896bfb44db08a Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Fri, 28 Sep 2012 18:32:01 +0900 Subject: [PATCH] --- yaml --- r: 333932 b: refs/heads/master c: f315e16850d00ae5b19f11810bc00bf68cf3c24a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/Makefile | 6 ++---- trunk/tools/perf/perf.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bb9cc6f86fee..cbf5b3b92dd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95485b1cda827e4db7102ad5fde1791087a0f4c5 +refs/heads/master: f315e16850d00ae5b19f11810bc00bf68cf3c24a diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile index 676302441e14..99b2bb371bcd 100644 --- a/trunk/tools/perf/Makefile +++ b/trunk/tools/perf/Makefile @@ -543,14 +543,12 @@ ifndef NO_LIBUNWIND LIB_OBJS += $(OUTPUT)util/unwind.o endif -ifdef NO_LIBAUDIT - BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT -else +ifndef NO_LIBAUDIT FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT)),y) msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev); - BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT else + BASIC_CFLAGS += -DLIBAUDIT_SUPPORT BUILTIN_OBJS += $(OUTPUT)builtin-trace.o EXTLIBS += -laudit endif diff --git a/trunk/tools/perf/perf.c b/trunk/tools/perf/perf.c index dacae4b8bcb4..6d50eb0b4251 100644 --- a/trunk/tools/perf/perf.c +++ b/trunk/tools/perf/perf.c @@ -55,7 +55,7 @@ static struct cmd_struct commands[] = { { "lock", cmd_lock, 0 }, { "kvm", cmd_kvm, 0 }, { "test", cmd_test, 0 }, -#ifndef NO_LIBAUDIT_SUPPORT +#ifdef LIBAUDIT_SUPPORT { "trace", cmd_trace, 0 }, #endif { "inject", cmd_inject, 0 },