From 11bd6317ec8d00b3a421516c2e9747a8f7a551ea Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 16 Aug 2014 18:43:51 +0200 Subject: configure.ac: Use AM_CFLAGS instead of CFLAGS. CFLAGS, CPPFLAGS, LDFLAGS and so on are so-called "user variables" and are meant for users of the package to use/override. The package itself should not set or modify them in any way. Instead, the "shadow variables" such as AM_CFLAGS, AM_CPPFLAGS, AM_LDFLAGS and so on, can be modified by the package. --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 10213a7..05c876e 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ AH_BOTTOM([#endif /* SRD_CONFIG_H */]) # Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden # and enforce use of SRD_API to explicitly mark all public API functions. -CFLAGS="$CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden" +AM_CFLAGS="$AM_CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden" # Checks for programs. AC_PROG_CC @@ -86,7 +86,7 @@ build_runtc="yes" # Note: glib-2.0 is part of the libsigrokdecode API # (hard pkg-config requirement). AM_PATH_GLIB_2_0([2.24.0], - [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) + [AM_CFLAGS="$AM_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # Python 3 is always needed. # Note: We need to try a few different variants, since some systems have a @@ -163,6 +163,8 @@ AC_SUBST(SRD_PACKAGE_VERSION_MINOR) AC_SUBST(SRD_PACKAGE_VERSION_MICRO) AC_SUBST(SRD_PACKAGE_VERSION) +AC_SUBST(AM_CFLAGS) + AM_CONDITIONAL(BUILD_RUNTC, test x"$build_runtc" = "xyes") AC_CONFIG_FILES([Makefile version.h libsigrokdecode.pc]) -- cgit v1.2.3-70-g09d2