From d161c099279e9ab564636c72423268e6da69f795 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 19 Nov 2009 13:25:42 -0800 Subject: [PATCH] Move C compiler warning (-W) flags from CFLAGS to AM_CFLAGS. C compiler warning options added by the "configure" script have until now been put into CFLAGS. However that option is supposed to be reserved for the user under Automake rules, so move them to AM_CFLAGS. Besides increased adherence to Automake rules, this is useful because AM_CFLAGS can be overridden on a per-target (e.g. program or library) basis, whereas CFLAGS cannot. In turn, building the sFlow library (which will be added in an upcoming commit) requires overriding the compiler flags to avoid some warning messages. (By modifying the warning flags, we avoid the need to modify the sFlow library in any way.) --- Makefile.am | 1 + acinclude.m4 | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index add0e72a9..de51e10f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,7 @@ AM_CPPFLAGS += -I $(top_srcdir)/include AM_CPPFLAGS += -I $(top_srcdir)/lib AM_CFLAGS = -Wstrict-prototypes +AM_CFLAGS += $(WARNING_FLAGS) if NDEBUG AM_CPPFLAGS += -DNDEBUG diff --git a/acinclude.m4 b/acinclude.m4 index 767414e60..e37a316df 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -230,8 +230,9 @@ AC_DEFUN([OVS_CHECK_CC_OPTION], dnl OVS_ENABLE_OPTION([OPTION]) dnl Check whether the given C compiler OPTION is accepted. -dnl If so, add it to CFLAGS. +dnl If so, add it to WARNING_FLAGS. dnl Example: OVS_ENABLE_OPTION([-Wdeclaration-after-statement]) AC_DEFUN([OVS_ENABLE_OPTION], - [OVS_CHECK_CC_OPTION([$1], [CFLAGS="$CFLAGS $1"])]) + [OVS_CHECK_CC_OPTION([$1], [WARNING_FLAGS="$WARNING_FLAGS $1"]) + AC_SUBST([WARNING_FLAGS])]) dnl ---------------------------------------------------------------------- -- 2.39.2