From cac95f10ce8723a539c138c0360741852e6baa24 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 25 Apr 2012 12:58:58 -0700 Subject: [PATCH] Merge from trunk rev 2037: The m4 shipped to handle Python was incorrectly clearing $CPPFLAGS. Additionally, do not repeat compiler flags for automake targets that already include them, and pass more flags to the Perl build. Signed-off-by: Kees Cook Acked-By: Steve Beattie --- libraries/libapparmor/m4/ac_python_devel.m4 | 2 ++ libraries/libapparmor/src/Makefile.am | 3 ++- libraries/libapparmor/swig/perl/Makefile.PL.in | 2 +- libraries/libapparmor/testsuite/Makefile.am | 3 +-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 index 260d715b8..8b5d414f2 100644 --- a/libraries/libapparmor/m4/ac_python_devel.m4 +++ b/libraries/libapparmor/m4/ac_python_devel.m4 @@ -158,6 +158,8 @@ $ac_distutils_result]) AC_MSG_CHECKING([consistency of all components of python development environment]) AC_LANG_PUSH([C]) # save current global flags + ac_save_LIBS="$LIBS" + ac_save_CPPFLAGS="$CPPFLAGS" LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" AC_TRY_LINK([ diff --git a/libraries/libapparmor/src/Makefile.am b/libraries/libapparmor/src/Makefile.am index de1b94b68..31aec0e86 100644 --- a/libraries/libapparmor/src/Makefile.am +++ b/libraries/libapparmor/src/Makefile.am @@ -3,7 +3,8 @@ INCLUDES = $(all_includes) BUILT_SOURCES = grammar.h scanner.h af_protos.h AM_LFLAGS = -v AM_YFLAGS = -d -p aalogparse_ -AM_CFLAGS = @CFLAGS@ -D_GNU_SOURCE -Wall +AM_CFLAGS = -Wall +AM_CPPFLAGS = -D_GNU_SOURCE scanner.h: scanner.l $(LEX) -v $< diff --git a/libraries/libapparmor/swig/perl/Makefile.PL.in b/libraries/libapparmor/swig/perl/Makefile.PL.in index ff0027c25..f93325e74 100644 --- a/libraries/libapparmor/swig/perl/Makefile.PL.in +++ b/libraries/libapparmor/swig/perl/Makefile.PL.in @@ -10,7 +10,7 @@ WriteMakefile( 'FIRST_MAKEFILE' => 'Makefile.perl', 'ABSTRACT' => q[Perl interface to AppArmor] , 'VERSION' => q[@VERSION@], - 'INC' => q[-I@top_srcdir@/src @CFLAGS@], + 'INC' => q[@CPPFLAGS@ -I@top_srcdir@/src @CFLAGS@], 'LIBS' => q[-L@top_builddir@/src/.libs/ -lapparmor @LIBS@], 'OBJECT' => 'libapparmor_wrap.o', # $(OBJ_EXT) ) ; diff --git a/libraries/libapparmor/testsuite/Makefile.am b/libraries/libapparmor/testsuite/Makefile.am index cb56b1f98..6a1d5d74b 100644 --- a/libraries/libapparmor/testsuite/Makefile.am +++ b/libraries/libapparmor/testsuite/Makefile.am @@ -10,8 +10,7 @@ AM_CFLAGS = -Wall noinst_PROGRAMS = test_multi.multi test_multi_multi_SOURCES = test_multi.c -test_multi_multi_CFLAGS = $(CFLAGS) -Wall -test_multi_multi_LDFLAGS = $(LDFLAGS) +test_multi_multi_CFLAGS = -Wall test_multi_multi_LDADD = -L../src/.libs -lapparmor clean-local: