From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 5 Apr 2013 16:11:56 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Tag: v1.4.19.1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8cf36930144ea49d1f5cb29835547b1baededfd;p=thirdparty%2Fiptables.git

Merge branch 'stable'

Resolve conflict with Nicolas' Dichtel update on utils/Makefile.am
for nfnl_osf.
---

c8cf36930144ea49d1f5cb29835547b1baededfd
diff --cc utils/Makefile.am
index bfafd1d0,66f5c5c1..c26aa640
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@@ -4,17 -4,7 +4,17 @@@ AM_CFLAGS = ${regular_CFLAGS
  AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include \
                -I${top_srcdir}/include ${libnfnetlink_CFLAGS}
  
 -sbin_PROGRAMS = nfnl_osf
 -pkgdata_DATA = pf.os
 +sbin_PROGRAMS =
 +pkgdata_DATA =
 +
 +if HAVE_LIBNFNETLINK
 +sbin_PROGRAMS += nfnl_osf
 +pkgdata_DATA += pf.os
  
- nfnl_osf_LDADD = -lnfnetlink
+ nfnl_osf_LDADD = ${libnfnetlink_LIBS}
 +endif
 +
 +if ENABLE_BPFC
 +sbin_PROGRAMS += nfbpf_compile
 +nfbpf_compile_LDADD = -lpcap
 +endif