From 8e336251e155888f0ac2c79259f8792fc31920a1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 1 Jun 2011 02:16:05 +0200 Subject: build: move basic preprocessor flags to regular_CPPFLAGS This is where they belong, after all. References: http://bugzilla.netfilter.org/show_bug.cgi?id=713 Signed-off-by: Jan Engelhardt --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 27cca9f8..77502fb6 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ AC_ARG_ENABLE([largefile], AS_HELP_STRING([--disable-largefile], [Do not build largefile support]), [enable_largefile="$enableval"], [enable_largefile="yes"; - largefile_cflags='-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64']) + largefile_cppflags='-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64']) AC_ARG_ENABLE([devel], AS_HELP_STRING([--enable-devel], [Install Xtables development headers]), @@ -83,10 +83,10 @@ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], [nfnetlink=1], [nfnetlink=0]) AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) -regular_CFLAGS="${largefile_cflags} \ - -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \ +regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ - -Winline -pipe \ + -Winline -pipe"; +regular_CPPFLAGS="${largefile_cppflags} -D_REENTRANT \ -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" -DXTABLES_INTERNAL"; kinclude_CFLAGS=""; if [[ -n "$kbuilddir" ]]; then @@ -98,6 +98,7 @@ fi; pkgdatadir='${datadir}/xtables'; AC_SUBST([regular_CFLAGS]) +AC_SUBST([regular_CPPFLAGS]) AC_SUBST([kinclude_CFLAGS]) AC_SUBST([kbuilddir]) AC_SUBST([ksourcedir]) -- cgit v1.2.3