* [PATCH 1/9] build: move global automake options into configure.ac
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
@ 2010-11-05 18:36 ` Jan Engelhardt
2010-11-05 18:36 ` [PATCH 2/9] build: remove statements without obvious effect Jan Engelhardt
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-11-05 18:36 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Makefile.am | 1 -
configure.ac | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5965387..cf74fca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
man_MANS = ulogd.8
diff --git a/configure.ac b/configure.ac
index e5a64fe..370b4b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.50])
AC_INIT([ulogd], [2.0.0beta4])
-AM_INIT_AUTOMAKE([-Wall])
+AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 1.6])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/9] build: remove statements without obvious effect
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
2010-11-05 18:36 ` [PATCH 1/9] build: move global automake options into configure.ac Jan Engelhardt
@ 2010-11-05 18:36 ` Jan Engelhardt
2010-11-05 18:36 ` [PATCH 3/9] build: remove -fPIC flag Jan Engelhardt
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-11-05 18:36 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Makefile.am | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index cf74fca..20822c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,10 +16,6 @@ edit = sed \
ulogd.conf: Makefile $(srcdir)/ulogd.conf.in
$(edit) $(srcdir)/ulogd.conf.in >ulogd.conf
-$(OBJECTS): libtool
-libtool: $(LIBTOOL_DEPS)
- $(SHELL) ./config.status --recheck
-
dist-hook:
rm -f ulogd.conf
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/9] build: remove -fPIC flag
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
2010-11-05 18:36 ` [PATCH 1/9] build: move global automake options into configure.ac Jan Engelhardt
2010-11-05 18:36 ` [PATCH 2/9] build: remove statements without obvious effect Jan Engelhardt
@ 2010-11-05 18:36 ` Jan Engelhardt
2010-11-05 18:36 ` [PATCH 4/9] build: remove unused $(all_includes) Jan Engelhardt
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-11-05 18:36 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
libtool automatically adds PIC flags as needed.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
input/flow/Makefile.am | 2 +-
input/packet/Makefile.am | 2 +-
libipulog/Makefile.am | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 11bf217..c2b5f88 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-fPIC -Wall
+AM_CFLAGS = -Wall
pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 566b817..4dff308 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-fPIC -Wall
+AM_CFLAGS = -Wall
LIBS=
pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la ulogd_inppkt_UNIXSOCK.la
diff --git a/libipulog/Makefile.am b/libipulog/Makefile.am
index a205cc6..290f8ee 100644
--- a/libipulog/Makefile.am
+++ b/libipulog/Makefile.am
@@ -1,8 +1,6 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-fPIC
-
noinst_LTLIBRARIES = libipulog.la
libipulog_la_SOURCES = libipulog.c
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/9] build: remove unused $(all_includes)
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
` (2 preceding siblings ...)
2010-11-05 18:36 ` [PATCH 3/9] build: remove -fPIC flag Jan Engelhardt
@ 2010-11-05 18:36 ` Jan Engelhardt
2010-11-05 18:36 ` [PATCH 5/9] output/LOGEMU: resolve build warning Jan Engelhardt
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-11-05 18:36 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Makefile.am | 2 +-
filter/Makefile.am | 2 +-
filter/raw2packet/Makefile.am | 2 +-
input/flow/Makefile.am | 2 +-
input/packet/Makefile.am | 2 +-
libipulog/Makefile.am | 2 +-
output/Makefile.am | 2 +-
output/dbi/Makefile.am | 2 +-
output/mysql/Makefile.am | 2 +-
output/pcap/Makefile.am | 2 +-
output/pgsql/Makefile.am | 2 +-
output/sqlite3/Makefile.am | 2 +-
src/Makefile.am | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 20822c2..d4c180b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ man_MANS = ulogd.8
EXTRA_DIST = $(man_MANS) ulogd.logrotate ulogd.spec ulogd.conf.in doc
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
SUBDIRS = include libipulog src input filter output
noinst_DATA = ulogd.conf
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 2483119..9b51670 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = raw2packet packet2flow
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
pkglib_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \
diff --git a/filter/raw2packet/Makefile.am b/filter/raw2packet/Makefile.am
index aa82e04..c959661 100644
--- a/filter/raw2packet/Makefile.am
+++ b/filter/raw2packet/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
pkglib_LTLIBRARIES = ulogd_raw2packet_BASE.la
diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index c2b5f88..21ab32f 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = -Wall
pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 4dff308..f8afc03 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = -Wall
LIBS=
diff --git a/libipulog/Makefile.am b/libipulog/Makefile.am
index 290f8ee..7c46bec 100644
--- a/libipulog/Makefile.am
+++ b/libipulog/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LTLIBRARIES = libipulog.la
diff --git a/output/Makefile.am b/output/Makefile.am
index c60c5e6..2c35054 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
LIBS=""
SUBDIRS= pcap mysql pgsql sqlite3 dbi
diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am
index 28c45a6..0e68cd3 100644
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(DBI_INC)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(DBI_INC)
LIBS=$(DBI_LIB)
if HAVE_DBI
diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index 50f3f92..8da758b 100644
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(MYSQL_INC)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(MYSQL_INC)
LIBS=$(MYSQL_LIB)
if HAVE_MYSQL
diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index b77b2d3..ac89cfe 100644
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(PCAP_INC)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(PCAP_INC)
LIBS=$(PCAP_LIB)
if HAVE_PCAP
diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index e8f4acc..99947bc 100644
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(PQINCPATH)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(PQINCPATH)
LIBS=$(PQLIBS)
if HAVE_PGSQL
diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index df1272a..d8bedc9 100644
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(SQLITE3_INC)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(SQLITE3_INC)
LIBS=$(SQLITE3_LIB)
if HAVE_SQLITE3
diff --git a/src/Makefile.am b/src/Makefile.am
index aa9a3fa..d83d13e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-DULOGD_CONFIGFILE="\"$(sysconfdir)/ulogd.conf\"" \
-DULOGD_LOGFILE_DEFAULT="\"$(localstatedir)/log/ulogd.log\""
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/9] output/LOGEMU: resolve build warning
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
` (3 preceding siblings ...)
2010-11-05 18:36 ` [PATCH 4/9] build: remove unused $(all_includes) Jan Engelhardt
@ 2010-11-05 18:36 ` Jan Engelhardt
2010-11-05 18:36 ` [PATCH 6/9] build: default to not building static libraries Jan Engelhardt
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-11-05 18:36 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
ulogd_output_LOGEMU.c:37:2: warning: #warning this libc does not
define HOST_NAME_MAX
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
output/ulogd_output_LOGEMU.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c
index 32b4954..d616cbf 100644
--- a/output/ulogd_output_LOGEMU.c
+++ b/output/ulogd_output_LOGEMU.c
@@ -23,7 +23,7 @@
* $Id$
*
*/
-
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/9] build: default to not building static libraries
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
` (4 preceding siblings ...)
2010-11-05 18:36 ` [PATCH 5/9] output/LOGEMU: resolve build warning Jan Engelhardt
@ 2010-11-05 18:36 ` Jan Engelhardt
2010-11-05 18:36 ` [PATCH 7/9] build: propagate global CFLAGS Jan Engelhardt
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-11-05 18:36 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
configure.ac | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 370b4b3..2447574 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ dnl Checks for programs.
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_INSTALL
+AC_DISABLE_STATIC
AC_PROG_LIBTOOL
dnl Checks for libraries.
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 7/9] build: propagate global CFLAGS
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
` (5 preceding siblings ...)
2010-11-05 18:36 ` [PATCH 6/9] build: default to not building static libraries Jan Engelhardt
@ 2010-11-05 18:36 ` Jan Engelhardt
2010-11-05 18:36 ` [PATCH 8/9] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-11-05 18:36 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
We must not override CFLAGS, because that will break when the user
overrides CFLAGS again at make time (which he is entitled to). So,
name our CFLAGS regular_CFLAGS, and also include that across all
Makefiles so that they are actually uesd for all the code.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
configure.ac | 3 ++-
filter/Makefile.am | 1 +
filter/raw2packet/Makefile.am | 1 +
input/flow/Makefile.am | 2 +-
input/packet/Makefile.am | 2 +-
libipulog/Makefile.am | 1 +
output/Makefile.am | 1 +
output/dbi/Makefile.am | 1 +
output/mysql/Makefile.am | 1 +
output/pcap/Makefile.am | 1 +
output/pgsql/Makefile.am | 1 +
output/sqlite3/Makefile.am | 1 +
src/Makefile.am | 1 +
13 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2447574..fec034e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,8 @@ dnl Checks for library functions.
AC_FUNC_VPRINTF
AC_CHECK_FUNCS(socket strerror)
-CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
+regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter"
+AC_SUBST([regular_CFLAGS])
dnl Check for the right nfnetlink version
LIBNFNETLINK_REQUIRED=0.0.39
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 9b51670..3c3f152 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,6 +1,7 @@
SUBDIRS = raw2packet packet2flow
AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = ${regular_CFLAGS}
pkglib_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \
diff --git a/filter/raw2packet/Makefile.am b/filter/raw2packet/Makefile.am
index c959661..8b5a4ad 100644
--- a/filter/raw2packet/Makefile.am
+++ b/filter/raw2packet/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = ${regular_CFLAGS}
pkglib_LTLIBRARIES = ulogd_raw2packet_BASE.la
diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 21ab32f..127caf6 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -Wall
+AM_CFLAGS = ${regular_CFLAGS}
pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index f8afc03..7fd8979 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -Wall
+AM_CFLAGS = ${regular_CFLAGS}
LIBS=
pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la ulogd_inppkt_UNIXSOCK.la
diff --git a/libipulog/Makefile.am b/libipulog/Makefile.am
index 7c46bec..111cd48 100644
--- a/libipulog/Makefile.am
+++ b/libipulog/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = ${regular_CFLAGS}
noinst_LTLIBRARIES = libipulog.la
diff --git a/output/Makefile.am b/output/Makefile.am
index 2c35054..34ffb2d 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,4 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = ${regular_CFLAGS}
LIBS=""
SUBDIRS= pcap mysql pgsql sqlite3 dbi
diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am
index 0e68cd3..1ee8f2a 100644
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include $(DBI_INC)
+AM_CFLAGS = ${regular_CFLAGS}
LIBS=$(DBI_LIB)
if HAVE_DBI
diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index 8da758b..a98cdeb 100644
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -1,4 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include $(MYSQL_INC)
+AM_CFLAGS = ${regular_CFLAGS}
LIBS=$(MYSQL_LIB)
if HAVE_MYSQL
diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index ac89cfe..59cb3f6 100644
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include $(PCAP_INC)
+AM_CFLAGS = ${regular_CFLAGS}
LIBS=$(PCAP_LIB)
if HAVE_PCAP
diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index 99947bc..32be79b 100644
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(PQINCPATH)
+AM_CFLAGS = ${regular_CFLAGS}
LIBS=$(PQLIBS)
if HAVE_PGSQL
diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index d8bedc9..d14398c 100644
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -1,4 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include $(SQLITE3_INC)
+AM_CFLAGS = ${regular_CFLAGS}
LIBS=$(SQLITE3_LIB)
if HAVE_SQLITE3
diff --git a/src/Makefile.am b/src/Makefile.am
index d83d13e..9ae7884 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/include \
-DULOGD_CONFIGFILE="\"$(sysconfdir)/ulogd.conf\"" \
-DULOGD_LOGFILE_DEFAULT="\"$(localstatedir)/log/ulogd.log\""
+AM_CFLAGS = ${regular_CFLAGS}
sbin_PROGRAMS = ulogd
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 8/9] build: no need for error message in PKG_CHECK_MODULES
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
` (6 preceding siblings ...)
2010-11-05 18:36 ` [PATCH 7/9] build: propagate global CFLAGS Jan Engelhardt
@ 2010-11-05 18:36 ` Jan Engelhardt
2010-11-05 18:36 ` [PATCH 9/9] filter/HWHDR: remove redundant sizeof(char) Jan Engelhardt
2010-11-07 19:56 ` ulogd2 build updates Pablo Neira Ayuso
9 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-11-05 18:36 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
PKG_CHECK_MODULES already produces its own (and more verbose) messsage
when a module cannot be found.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
configure.ac | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index fec034e..75372fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,16 +36,9 @@ regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter"
AC_SUBST([regular_CFLAGS])
dnl Check for the right nfnetlink version
-LIBNFNETLINK_REQUIRED=0.0.39
-LIBNETFILTER_CONNTRACK_REQUIRED=0.0.95
-LIBNETFILTER_LOG_REQUIRED=1.0.0
-
-PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,, AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED))
-
-PKG_CHECK_MODULES(LIBNETFILTER_CONNTRACK, libnetfilter_conntrack >= $LIBNETFILTER_CONNTRACK_REQUIRED,, AC_MSG_ERROR(Cannot find libnetfilter_conntrack >= $LIBNETFILTER_CONNTRACK_REQUIRED))
-
-PKG_CHECK_MODULES(LIBNETFILTER_LOG, libnetfilter_log >= $LIBNETFILTER_LOG_REQUIRED,, AC_MSG_ERROR(Cannot find libnetfilter_log >= $LIBNETFILTER_LOG_REQUIRED))
-
+PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.39])
+PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 0.0.95])
+PKG_CHECK_MODULES([LIBNETFILTER_LOG], [libnetfilter_log >= 1.0.0])
CT_CHECK_POSTGRES_DB()
AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x")
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 9/9] filter/HWHDR: remove redundant sizeof(char)
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
` (7 preceding siblings ...)
2010-11-05 18:36 ` [PATCH 8/9] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt
@ 2010-11-05 18:36 ` Jan Engelhardt
2010-11-07 19:56 ` ulogd2 build updates Pablo Neira Ayuso
9 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-11-05 18:36 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
It is 1 by definition.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
filter/ulogd_filter_HWHDR.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/filter/ulogd_filter_HWHDR.c b/filter/ulogd_filter_HWHDR.c
index 0e3f627..3b713a5 100644
--- a/filter/ulogd_filter_HWHDR.c
+++ b/filter/ulogd_filter_HWHDR.c
@@ -118,7 +118,7 @@ static int parse_mac2str(struct ulogd_key *ret, unsigned char *mac,
char *buf_cur;
int i;
- if (len/sizeof(char)*3 + 1 > HWADDR_LENGTH)
+ if (len * 3 + 1 > HWADDR_LENGTH)
return ULOGD_IRET_ERR;
if (len == 0)
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: ulogd2 build updates
2010-11-05 18:36 ulogd2 build updates Jan Engelhardt
` (8 preceding siblings ...)
2010-11-05 18:36 ` [PATCH 9/9] filter/HWHDR: remove redundant sizeof(char) Jan Engelhardt
@ 2010-11-07 19:56 ` Pablo Neira Ayuso
9 siblings, 0 replies; 13+ messages in thread
From: Pablo Neira Ayuso @ 2010-11-07 19:56 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: netfilter-devel
On 05/11/10 19:36, Jan Engelhardt wrote:
> The following changes since commit 1521d3de58250a9c475995f611bd2cae14741fb2:
>
> Add helper script pcap2ulog (2010-10-23 11:48:06 +0200)
>
> are available in the git repository at:
> git://dev.medozas.de/ulogd2 master
I have applied this as well, thanks Jan.
^ permalink raw reply [flat|nested] 13+ messages in thread