[lxc-devel] [PATCH] split -lcap and -lselinux out of LIBS

[Serge Hallyn]

Quoting Dwight Engen (dwight.engen at oracle.com):
> Signed-off-by: Dwight Engen <dwight.engen at oracle.com>

Thanks :)  Haven't tested but sounds good in theory.

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  configure.ac        | 6 +++---
>  src/lxc/Makefile.am | 4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 8f5d21c..37eb9d5 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -218,8 +218,8 @@ fi
>  AM_CONDITIONAL([ENABLE_SELINUX], [test "x$enable_selinux" = "xyes"])
>  AM_COND_IF([ENABLE_SELINUX],
>  	[AC_CHECK_HEADER([selinux/selinux.h],[],[AC_MSG_ERROR([You must install the SELinux development package in order to compile lxc])])
> -	AC_CHECK_LIB([selinux], [setexeccon_raw],[],[AC_MSG_ERROR([You must install the SELinux development package in order to compile lxc])])
> -	AC_SUBST([SELINUX_LIBS])])
> +	AC_CHECK_LIB([selinux], [setexeccon_raw],[true],[AC_MSG_ERROR([You must install the SELinux development package in order to compile lxc])])
> +	AC_SUBST([SELINUX_LIBS], [-lselinux])])
>  
>  # Seccomp syscall filter
>  AC_ARG_ENABLE([seccomp],
> @@ -277,7 +277,7 @@ fi
>  AM_CONDITIONAL([ENABLE_CAP], [test "x$enable_capabilities" = "xyes"])
>  
>  AM_COND_IF([ENABLE_CAP],
> -	[AC_CHECK_LIB(cap,cap_set_proc,[],[AC_MSG_ERROR([You are missing libcap support.])])
> +	[AC_CHECK_LIB(cap,cap_set_proc,[true],[AC_MSG_ERROR([You are missing libcap support.])])
>  	AC_SUBST([CAP_LIBS], [-lcap])])
>  
>  # HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0
> diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
> index 2403bd7..009b446 100644
> --- a/src/lxc/Makefile.am
> +++ b/src/lxc/Makefile.am
> @@ -152,7 +152,7 @@ liblxc_so_LDFLAGS = \
>  	-shared \
>  	-Wl,-soname,liblxc.so.$(firstword $(subst ., ,$(VERSION)))
>  
> -liblxc_so_LDADD = $(CAP_LIBS) $(APPARMOR_LIBS) $(SECCOMP_LIBS)
> +liblxc_so_LDADD = $(CAP_LIBS) $(APPARMOR_LIBS) $(SELINUX_LIBS) $(SECCOMP_LIBS)
>  
>  if ENABLE_CGMANAGER
>  liblxc_so_LDADD += $(CGMANAGER_LIBS) $(DBUS_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS)
> @@ -208,7 +208,7 @@ AM_LDFLAGS = -Wl,-E
>  if ENABLE_RPATH
>  AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir)
>  endif
> -LDADD=liblxc.so @CAP_LIBS@ @APPARMOR_LIBS@ @SECCOMP_LIBS@
> +LDADD=liblxc.so @CAP_LIBS@ @APPARMOR_LIBS@ @SELINUX_LIBS@ @SECCOMP_LIBS@
>  
>  lxc_attach_SOURCES = lxc_attach.c
>  lxc_autostart_SOURCES = lxc_autostart.c
> -- 
> 1.9.3
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel