[netfilter-cvslog] r7295 - in trunk/iptables: . extensions

kaber at trash.net kaber at trash.net
Tue Jan 29 14:32:08 CET 2008


Author: kaber at trash.net
Date: 2008-01-29 14:32:07 +0100 (Tue, 29 Jan 2008)
New Revision: 7295

Modified:
   trunk/iptables/Makefile.am
   trunk/iptables/configure.ac
   trunk/iptables/extensions/GNUmakefile.in
Log:
[PATCH]: 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 at computergmbh.de>


Modified: trunk/iptables/Makefile.am
===================================================================
--- trunk/iptables/Makefile.am	2008-01-23 12:56:05 UTC (rev 7294)
+++ trunk/iptables/Makefile.am	2008-01-29 13:32:07 UTC (rev 7295)
@@ -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

Modified: trunk/iptables/configure.ac
===================================================================
--- trunk/iptables/configure.ac	2008-01-23 12:56:05 UTC (rev 7294)
+++ trunk/iptables/configure.ac	2008-01-29 13:32:07 UTC (rev 7295)
@@ -40,15 +40,15 @@
 	-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])

Modified: trunk/iptables/extensions/GNUmakefile.in
===================================================================
--- trunk/iptables/extensions/GNUmakefile.in	2008-01-23 12:56:05 UTC (rev 7294)
+++ trunk/iptables/extensions/GNUmakefile.in	2008-01-29 13:32:07 UTC (rev 7295)
@@ -14,8 +14,9 @@
 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 @@
 	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 $<;




More information about the netfilter-cvslog mailing list