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>

diff --cc extensions/GNUmakefile.in
index c5d88446c8c2377804afbde003ee76348c72bac5,780e71507c519b5ace3f92a965d0f05222e194aa..52915725a44346dbc9a42f913d52b00cd6ee7aff
--- 1/extensions/GNUmakefile.in
--- 2/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@