Michael has proposed merging lp:~kensington/apparmor/apparmor into lp:apparmor.

Requested reviews:
  AppArmor Developers (apparmor-dev)

For more details, see:
https://code.launchpad.net/~kensington/apparmor/apparmor/+merge/143044

Two small changes:

* Respect LDFLAGS while building the parser
* Remove an unused configure option
-- 
https://code.launchpad.net/~kensington/apparmor/apparmor/+merge/143044
Your team AppArmor Developers is requested to review the proposed merge of 
lp:~kensington/apparmor/apparmor into lp:apparmor.
=== modified file 'libraries/libapparmor/configure.in'
--- libraries/libapparmor/configure.in	2012-11-14 19:00:06 +0000
+++ libraries/libapparmor/configure.in	2013-01-13 14:19:21 +0000
@@ -59,7 +59,6 @@
 AM_CONDITIONAL(HAVE_PYTHON, test x$with_python = xyes)
 AM_CONDITIONAL(HAVE_PERL, test x$with_perl = xyes) 
 AM_CONDITIONAL(HAVE_RUBY, test x$with_ruby = xyes)
-AM_CONDITIONAL(BUILD_ROOTLIB, test x$enable_rootlib = xyes)
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h stdint.h)

=== modified file 'parser/Makefile'
--- parser/Makefile	2012-08-16 23:26:03 +0000
+++ parser/Makefile	2013-01-13 14:19:21 +0000
@@ -153,7 +153,7 @@
 	ln -s `$(CXX) -print-file-name=libstdc++.a`
 
 apparmor_parser: $(OBJECTS) $(AAREOBJECTS)
-	$(CXX) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
+	$(CXX) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
 	      ${LEXLIB}  $(AAREOBJECTS) $(AARE_LDFLAGS)
 
 parser_yacc.c parser_yacc.h: parser_yacc.y parser.h

-- 
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/apparmor

Reply via email to