[libvirt] build: fix linking virt-login-shell

[Daniel P. Berrange]

On Mon, Oct 21, 2013 at 03:36:11PM -0600, Jim Fehlig wrote:
> >From a0f35945f3127ab70d051101037e821b1759b4bb Mon Sep 17 00:00:00 2001
> From: Jim Fehlig <jfehlig at suse.com>
> Date: Mon, 21 Oct 2013 15:30:02 -0600
> Subject: [PATCH] build: fix virt-login-shell build with apparmor
> 
> With libapparmor-devel installed, virt-login-shell fails to link
> 
> CCLD     virt-login-shell
> ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-vircommand.o): In function `virExec':
> /home/jfehlig/virt/upstream/libvirt/src/util/vircommand.c:653: undefined reference to `aa_change_profile'
> collect2: error: ld returned 1 exit status
> 
> Fix by linking libvirt_setuid_rpc_client with previously determined
> SECDRIVER_LIBS in src/Makefile.am.  While at it, introduce SECDRIVER_CFLAGS
> and use both throughout src/Makefile.am where it makes sense.
> 
> Signed-off-by: Jim Fehlig <jfehlig at suse.com>
> ---
>  src/Makefile.am | 16 +++++++---------
>  1 file changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 9dab4df..21b9caf 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -49,11 +49,14 @@ nodist_conf_DATA =
>  
>  THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
>  
> +SECDRIVER_CFLAGS =
>  SECDRIVER_LIBS =
>  if WITH_SECDRIVER_SELINUX
> +SECDRIVER_CFLAGS += $(SELINUX_CFLAGS)
>  SECDRIVER_LIBS += $(SELINUX_LIBS)
>  endif WITH_SECDRIVER_SELINUX
>  if WITH_SECDRIVER_APPARMOR
> +SECDRIVER_CFLAGS += $(APPARMOR_CFLAGS)
>  SECDRIVER_LIBS += $(APPARMOR_LIBS)
>  endif WITH_SECDRIVER_APPARMOR
>  
> @@ -2027,14 +2030,14 @@ libvirt_setuid_rpc_client_la_SOURCES = 		\
>  libvirt_setuid_rpc_client_la_LDFLAGS =		\
>  		$(AM_LDFLAGS)			\
>  		$(LIBXML_LIBS)			\
> -		$(SELINUX_LIBS)			\
> +		$(SECDRIVER_LIBS)		\
>  		$(NULL)
>  libvirt_setuid_rpc_client_la_CFLAGS =		\
>  		-DLIBVIRT_SETUID_RPC_CLIENT	\
>  		-I$(top_srcdir)/src/conf	\
>  		-I$(top_srcdir)/src/rpc		\
>  		$(AM_CFLAGS)			\
> -		$(SELINUX_CFLAGS)		\
> +		$(SECDRIVER_CFLAGS)		\
>  		$(NULL)
>  endif WITH_LXC
>  
> @@ -2316,7 +2319,7 @@ libvirt_net_rpc_la_LDFLAGS = \
>  			$(GNUTLS_LIBS) \
>  			$(SASL_LIBS) \
>  			$(SSH2_LIBS)\
> -			$(SELINUX_LIBS) \
> +			$(SECDRIVER_LIBS) \
>  			$(AM_LDFLAGS) \
>  			$(CYGWIN_EXTRA_LDFLAGS) \
>  			$(MINGW_EXTRA_LDFLAGS)
> @@ -2460,12 +2463,7 @@ if WITH_BLKID
>  libvirt_lxc_CFLAGS += $(BLKID_CFLAGS)
>  libvirt_lxc_LDADD += $(BLKID_LIBS)
>  endif WITH_BLKID
> -if WITH_SECDRIVER_SELINUX
> -libvirt_lxc_CFLAGS += $(SELINUX_CFLAGS)
> -endif WITH_SECDRIVER_SELINUX
> -if WITH_SECDRIVER_APPARMOR
> -libvirt_lxc_CFLAGS += $(APPARMOR_CFLAGS)
> -endif WITH_SECDRIVER_APPARMOR
> +libvirt_lxc_CFLAGS += $(SECDRIVER_CFLAGS)
>  endif WITH_LIBVIRTD
>  endif WITH_LXC
>  EXTRA_DIST += $(LXC_CONTROLLER_SOURCES)

ACK to this version of the patch

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|