ulogd fixes

ulogd fixes

[Jan Engelhardt]

The following changes since commit 85393baff66bfe69d053e1bf3a7230025e5f229a:

  XML: add missing include (2012-11-04 09:19:53 +0100)

are available in the git repository at:

  git://git.inai.de/ulogd master

for you to fetch changes up to 58a5cac020af30544c59b32496072ee131b65821:

  build: resolve compile error due to missing nfacct CPPFLAGS (2012-11-27 00:53:10 +0100)

----------------------------------------------------------------
Jan Engelhardt (2):
      build: resolve automake-1.12 warnings
      build: resolve compile error due to missing nfacct CPPFLAGS

 configure.ac       |    1 +
 output/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

[PATCH 1/2] build: resolve automake-1.12 warnings

[Jan Engelhardt]

/usr/share/automake-1.12/am/ltlibrary.am: warning:
'ulogd_output_SQLITE3.la': linking libtool libraries using a non-POSIX
archiver requires 'AM_PROG_AR' in 'configure.ac'
(one for each .la)

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 configure.ac |    1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index c70887d..df0e9d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-- 
1.7.10.4

[PATCH 2/2] build: resolve compile error due to missing nfacct CPPFLAGS

[Jan Engelhardt]

Fixes this error:

make[3]: Entering directory "/home/jengelh/code/ulogd2/output"
  CC       ulogd_output_XML.lo
ulogd_output_XML.c:31:49: fatal error:
libnetfilter_acct/libnetfilter_acct.h: No such file or directory

(Note that pkgconfig-provided cflags are actually cppflags, so
I add ${LIBNETFILTER_ACCT_CFLAGS} to AM_CPPFLAGS.)

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 output/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/output/Makefile.am b/output/Makefile.am
index 630aee6..61d827a 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS}
 AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \
 	    ${LIBNETFILTER_CONNTRACK_CFLAGS}
 
-- 
1.7.10.4

Re: [PATCH 2/2] build: resolve compile error due to missing nfacct CPPFLAGS

[Eric Leblond]

[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]

Hello,

On Tue, 2012-11-27 at 00:54 +0100, Jan Engelhardt wrote:
> Fixes this error:
> 
> make[3]: Entering directory "/home/jengelh/code/ulogd2/output"
>   CC       ulogd_output_XML.lo
> ulogd_output_XML.c:31:49: fatal error:
> libnetfilter_acct/libnetfilter_acct.h: No such file or directory
> 
> (Note that pkgconfig-provided cflags are actually cppflags, so
> I add ${LIBNETFILTER_ACCT_CFLAGS} to AM_CPPFLAGS.)
> 
> Signed-off-by: Jan Engelhardt <jengelh@inai.de>
> ---
>  output/Makefile.am |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/output/Makefile.am b/output/Makefile.am
> index 630aee6..61d827a 100644
> --- a/output/Makefile.am
> +++ b/output/Makefile.am
> @@ -1,4 +1,4 @@
> -AM_CPPFLAGS = -I$(top_srcdir)/include
> +AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS}
>  AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \
>  	    ${LIBNETFILTER_CONNTRACK_CFLAGS}

Good catch but on last line we use the other ${LIBNETFILTER*_CFLAGS} to
populate AM_CFLAGS. We should keep all variables at the same place. If
we follow your indication in the commit we should use AM_CPPFLAGS (I'm
agree with that).

BR,
-- 
Eric Leblond <eric@regit.org>
Blog: https://home.regit.org/

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 1/2] build: resolve automake-1.12 warnings

[Eric Leblond]

[-- Attachment #1: Type: text/plain, Size: 955 bytes --]

Hello,

On Tue, 2012-11-27 at 00:54 +0100, Jan Engelhardt wrote:
> /usr/share/automake-1.12/am/ltlibrary.am: warning:
> 'ulogd_output_SQLITE3.la': linking libtool libraries using a non-POSIX
> archiver requires 'AM_PROG_AR' in 'configure.ac'
> (one for each .la)
> 
> Signed-off-by: Jan Engelhardt <jengelh@inai.de>
> ---
>  configure.ac |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configure.ac b/configure.ac
> index c70887d..df0e9d3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -6,6 +6,7 @@ AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b])
>  AC_CONFIG_HEADER([config.h])
>  AC_CONFIG_MACRO_DIR([m4])
>  
> +m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
>  dnl kernel style compile messages
>  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

I've applied this patch which even work with an old automake ;)

BR,
-- 
Eric Leblond <eric@regit.org>
Blog: https://home.regit.org/

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 2/2] build: resolve compile error due to missing nfacct CPPFLAGS

[Jan Engelhardt]

On Tuesday 2012-11-27 08:54, Eric Leblond wrote:
>> index 630aee6..61d827a 100644
>> --- a/output/Makefile.am
>> +++ b/output/Makefile.am
>> @@ -1,4 +1,4 @@
>> -AM_CPPFLAGS = -I$(top_srcdir)/include
>> +AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS}
>>  AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \
>>  	    ${LIBNETFILTER_CONNTRACK_CFLAGS}
>
>Good catch but on last line we use the other ${LIBNETFILTER*_CFLAGS} to
>populate AM_CFLAGS. We should keep all variables at the same place. If
>we follow your indication in the commit we should use AM_CPPFLAGS (I'm
>agree with that).

I can send another patch moving all the pkgconfig variables to
CPPFLAGS.

Re: [PATCH 2/2] build: resolve compile error due to missing nfacct CPPFLAGS

[Eric Leblond]

Hi,

On Tue, 2012-11-27 at 12:51 +0100, Jan Engelhardt wrote:
> On Tuesday 2012-11-27 08:54, Eric Leblond wrote:
> >> index 630aee6..61d827a 100644
> >> --- a/output/Makefile.am
> >> +++ b/output/Makefile.am
> >> @@ -1,4 +1,4 @@
> >> -AM_CPPFLAGS = -I$(top_srcdir)/include
> >> +AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS}
> >>  AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \
> >>  	    ${LIBNETFILTER_CONNTRACK_CFLAGS}
> >
> >Good catch but on last line we use the other ${LIBNETFILTER*_CFLAGS} to
> >populate AM_CFLAGS. We should keep all variables at the same place. If
> >we follow your indication in the commit we should use AM_CPPFLAGS (I'm
> >agree with that).
> 
> I can send another patch moving all the pkgconfig variables to
> CPPFLAGS.

Please do, I will push your two patches to the public tree once done.

BR,
-- 
Eric Leblond <eric@regit.org>
Blog: https://home.regit.org/