From: Florian Westphal <fw@strlen.de>
Date: Sat, 23 Nov 2013 22:50:17 +0000 (+0100)
Subject: Merge branch 'stable-1.4.20'
X-Git-Tag: v1.6.0~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73dcee35a394b0fcf83f99d278bc03515de07d4b;p=thirdparty%2Fiptables.git

Merge branch 'stable-1.4.20'

... to get 76e230e ('iptables: link against libnetfilter_conntrack'),
else static build doesn't work.

Conflicts:
	extensions/GNUmakefile.in

[ CPPFLAGS was added in master, so keep it ]

Reported-By: Gustavo Zacarias <gustavo@zacarias.com.ar>
---

73dcee35a394b0fcf83f99d278bc03515de07d4b
diff --cc extensions/GNUmakefile.in
index c5d88446,780e7150..52915725
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@@ -21,7 -21,7 +21,7 @@@ regular_CPPFLAGS   = @regular_CPPFLAGS
  kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
  
  AM_CFLAGS       = ${regular_CFLAGS}
- AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS}
 -AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} @libnetfilter_conntrack_CFLAGS@
++AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@
  AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
  AM_LDFLAGS      = @noundef_LDFLAGS@