diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2008-01-29 13:32:07 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-01-29 13:32:07 +0000 |
| commit | fb6209a30fd576cd740eefe0a3ad88d65d2bb2b7 (patch) | |
| tree | 08f9e7c7545c7d4a07179ad0bce3086dbb6e7448 | |
| parent | 2b62b62509dfccdb6ebbb17628aad95fb7681a89 (diff) | |
Give preference to iptables header files
Have the header files in the iptables source tree take precedence
over those from the kernel source. Otherwise, building the current
iptables from subversion just fails with kernels < 2.6.25.
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | extensions/GNUmakefile.in | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 17c78a7c..a0f33c62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,10 @@ # -*- Makefile -*- AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = ${regular_CFLAGS} -I${top_srcdir}/include + +regular_CFLAGS := @regular_CFLAGS@ +kinclude_CFLAGS := @kinclude_CFLAGS@ +AM_CFLAGS = ${regular_CFLAGS} -I${top_srcdir}/include ${kinclude_CFLAGS} SUBDIRS := extensions if ENABLE_DEVEL SUBDIRS += libipq diff --git a/configure.ac b/configure.ac index 3314df40..e6163297 100644 --- a/configure.ac +++ b/configure.ac @@ -40,15 +40,15 @@ regular_CFLAGS="-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 \ -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \ -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ -Winline -pipe -DIPTABLES_VERSION=\\\"$PACKAGE_VERSION\\\" \ - -DIPT_LIB_DIR=\\\"\${iptdir}\\\" \ - -I\"$kbuilddir/include\" -I\"$ksourcedir/include\"" + -DIPT_LIB_DIR=\\\"\${iptdir}\\\""; +kinclude_CFLAGS="-I\"$kbuilddir/include\" -I\"$ksourcedir/include\""; # Remove workarounds soon regular_CFLAGS="$regular_CFLAGS -Wno-aggregate-return \ -Wno-missing-declarations -Wno-missing-prototypes \ -Wno-redundant-decls -Wno-shadow -Wno-strict-prototypes -Wno-inline" -AC_SUBST([regular_CFLAGS]) +AC_SUBST([regular_CFLAGS kinclude_CFLAGS]) AC_SUBST([kbuilddir]) AC_SUBST([ksourcedir]) AC_SUBST([iptdir]) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index 29a8ca62..1521a330 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -14,8 +14,9 @@ CCLD := ${CC} CFLAGS := @CFLAGS@ LDFLAGS := @LDFLAGS@ regular_CFLAGS := @regular_CFLAGS@ +kinclude_CFLAGS := @kinclude_CFLAGS@ -AM_CFLAGS := ${regular_CFLAGS} -I${top_srcdir}/include +AM_CFLAGS := ${regular_CFLAGS} -I${top_srcdir}/include ${kinclude_CFLAGS} AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ ifeq (${V},) @@ -88,7 +89,7 @@ clean: rm -f *.o *.oo *.so *.a {matches,targets}[46].man initext4.c initext6.c; distclean: clean - rm -f .*.d *.dd; + rm -f .*.d .*.dd; %.o: %.c ${AM_VERBOSE_CC} ${CC} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=$*_init ${CFLAGS} -o $@ -c $<; |