[apparmor] [patch 3/3] regression tests: build against in-tree libapparmor by default [v2]

[Steve Beattie]

On Mon, Jan 06, 2014 at 02:22:16PM -0600, Tyler Hicks wrote:
> On 2013-12-24 12:59:35, Steve Beattie wrote:
> > +ifdef USE_SYSTEM
> > +  # use the system libapparmor headers and library
> > +  LIBAPPARMOR = $(shell if pkg-config --exists libapparmor ; then \
> > +				pkg-config --silence-errors --libs libapparmor ; \
> > +			elif ldconfig -p | grep -q libapparmor\.so$$ ; then \
> > +				echo -lapparmor ; \
> > +			fi )
> > +  ifeq ($(strip $(LIBAPPARMOR)),)
> > +    $(error Unable to find libapparmor installed on this system; either \
> > +	    install libapparmor devel packages, set the LIBAPPARMOR variable \
> > +	    manually, or build against in-tree libapparmor)
> > +  endif # LIBAPPARMOR not set
> > +  LDLIBS += -lapparmor
> 
> I think we want this, instead:
> 
>  LDLIBS += $(LIBAPPARMOR)
> 
> This way we benefit from using pkg-config, when available.

[insert facepalm.png here] Uh, yeah. I'll fix that. Doh.

> Otherwise, Acked-by: Tyler Hicks <tyhicks at canonical.com>
> 
> Thanks!

Thanks for the review and catching that!

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140106/f9c7835d/attachment.pgp>