From 05f0f93a93452070006524ac22a6f51e19f8271f Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 22 Jan 2018 12:14:21 +0100 Subject: [PATCH] autotools: do not link against libapparmor Since we write the label directly without going through the AppArmor API it doesn't make sense to link against it. Signed-off-by: Christian Brauner --- configure.ac | 5 ----- src/lxc/Makefile.am | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 0bcd75a28..6713539b4 100644 --- a/configure.ac +++ b/configure.ac @@ -258,11 +258,6 @@ if test "$enable_apparmor" = "auto" ; then fi AM_CONDITIONAL([ENABLE_APPARMOR], [test "x$enable_apparmor" = "xyes"]) -AM_COND_IF([ENABLE_APPARMOR], - [AC_CHECK_HEADER([sys/apparmor.h],[],[AC_MSG_ERROR([You must install the AppArmor development package in order to compile lxc])]) - AC_CHECK_LIB([apparmor], [aa_change_profile],[],[AC_MSG_ERROR([You must install the AppArmor development package in order to compile lxc])]) - AC_SUBST([APPARMOR_LIBS], [-lapparmor])]) - # GnuTLS AC_ARG_ENABLE([gnutls], [AC_HELP_STRING([--enable-gnutls], [enable GnuTLS support [default=auto]])], diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 895684e0b..8f9a7ab29 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -207,7 +207,7 @@ liblxc_la_LDFLAGS = \ -Wl,-soname,liblxc.so.$(firstword $(subst ., ,@LXC_ABI@)) \ -version-info @LXC_ABI_MAJOR@ -liblxc_la_LIBADD = $(CAP_LIBS) $(APPARMOR_LIBS) $(SELINUX_LIBS) $(SECCOMP_LIBS) +liblxc_la_LIBADD = $(CAP_LIBS) $(SELINUX_LIBS) $(SECCOMP_LIBS) if ENABLE_CGMANAGER liblxc_la_LIBADD += $(CGMANAGER_LIBS) $(DBUS_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS) @@ -264,7 +264,7 @@ AM_LDFLAGS = -Wl,-E if ENABLE_RPATH AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir) endif -LDADD=liblxc.la @CAP_LIBS@ @APPARMOR_LIBS@ @SELINUX_LIBS@ @SECCOMP_LIBS@ +LDADD=liblxc.la @CAP_LIBS@ @SELINUX_LIBS@ @SECCOMP_LIBS@ lxc_attach_SOURCES = tools/lxc_attach.c tools/arguments.c lxc_autostart_SOURCES = tools/lxc_autostart.c tools/arguments.c -- 2.47.2