From: Christian Brauner Date: Mon, 22 Jan 2018 11:14:21 +0000 (+0100) Subject: autotools: do not link against libapparmor X-Git-Tag: lxc-2.0.10~372 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c199625da0ab943795c2de0aba92f4d495f279;p=thirdparty%2Flxc.git 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 --- diff --git a/configure.ac b/configure.ac index 2f20e867a..b0d7112e6 100644 --- a/configure.ac +++ b/configure.ac @@ -254,11 +254,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 5f8975e02..d9e19f29d 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -193,7 +193,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) @@ -249,7 +249,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