libnfnetlink: build fixes

libnfnetlink: build fixes

[Jan Engelhardt]

The following changes since commit 87eac438d72e8abfc05d9dc99ff80db8789ca5fd:

  utils: resolve compiler warning (2011-07-30 20:57:13 +0200)

are available in the git repository at:
  git://dev.medozas.de/libnfnetlink master

Jan Engelhardt (2):
      nfnl: avoid exit on large packet
      build: fix error with automake-1.9

 .gitignore         |    2 ++
 configure.ac       |    1 +
 src/libnfnetlink.c |    4 +---
 3 files changed, 4 insertions(+), 3 deletions(-)

[PATCH 1/2] nfnl: avoid exit on large packet

[Jan Engelhardt]

Using exit from shared libraries is unwelcome (automated build systems
flag it) and one should rather return gracefully. Looking at this
particular spot however, while a

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 src/libnfnetlink.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c
index 2f962fc..0234e6f 100644
--- a/src/libnfnetlink.c
+++ b/src/libnfnetlink.c
@@ -779,10 +779,8 @@ cont:
 			nfnl_error("Messages truncated\n");
 			continue;
 		}
-		if (status) {
+		if (status)
 			nfnl_error("Remnant of size %d\n", status);
-			exit(1);
-		}
 	}
 }
 
-- 
1.7.3.4

[PATCH 2/2] build: fix error with automake-1.9

[Jan Engelhardt]

src/Makefile.am: C objects in subdir but "AM_PROG_CC_C_O"
not in "configure.ac"

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 .gitignore   |    2 ++
 configure.ac |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6f5ca1f..c7acff2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ Makefile.in
 
 /aclocal.m4
 /autom4te.cache
+/compile
 /config.*
 /configure
 /depcomp
@@ -15,5 +16,6 @@ Makefile.in
 /libtool
 /ltmain.sh
 /missing
+/stamp-h1
 
 /*.pc
diff --git a/configure.ac b/configure.ac
index dedf2f8..25a5b41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_EXEEXT
 AC_DISABLE_STATIC
 AM_PROG_LIBTOOL
-- 
1.7.3.4

Re: libnfnetlink: build fixes

[Pablo Neira Ayuso]

On 03/08/11 17:11, Jan Engelhardt wrote:
> git://dev.medozas.de/libnfnetlink master

both applied, thanks