All of lore.kernel.org
 help / color / mirror / Atom feed
* ulogd2: build fixes
@ 2011-02-02 21:51 Jan Engelhardt
  2011-02-02 21:51 ` [PATCH 1/3] build: avoid use of LIBS variable Jan Engelhardt
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Jan Engelhardt @ 2011-02-02 21:51 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel


The following changes since commit 4f652cc32aebeac20f46009f146ad973a1ed0e99:

  NFCT: fix bug in polling mode (2010-12-09 12:02:15 +0100)

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

Jan Engelhardt (3):
      build: avoid use of LIBS variable
      build: use appropriate location for program modules
      build: use compile/link information from pkgconfig

Pablo Neira Ayuso (1):
      ulogd: fix double call of stop for reused input plugins

 Makefile.am                   |    2 +-
 configure.ac                  |    5 ++-
 filter/Makefile.am            |   13 ++++++-----
 filter/raw2packet/Makefile.am |    2 +-
 include/ulogd/ulogd.h         |    2 +
 input/flow/Makefile.am        |    2 +-
 input/packet/Makefile.am      |    4 +-
 output/Makefile.am            |   15 +++++++------
 output/dbi/Makefile.am        |    4 +-
 output/mysql/Makefile.am      |    4 +-
 output/pcap/Makefile.am       |    4 +-
 output/pgsql/Makefile.am      |    4 +-
 output/sqlite3/Makefile.am    |    4 +-
 src/Makefile.am               |    1 +
 src/ulogd.c                   |   14 +++++++++++-
 ulogd.conf.in                 |   42 ++++++++++++++++++++--------------------
 16 files changed, 69 insertions(+), 53 deletions(-)

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 1/3] build: avoid use of LIBS variable
  2011-02-02 21:51 ulogd2: build fixes Jan Engelhardt
@ 2011-02-02 21:51 ` Jan Engelhardt
  2011-02-02 21:51 ` [PATCH 2/3] build: use appropriate location for program modules Jan Engelhardt
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Jan Engelhardt @ 2011-02-02 21:51 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

The variable contains global libraries linked into every possible
object, which is unwanted. Clean up things.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac               |    3 ++-
 input/packet/Makefile.am   |    1 -
 output/Makefile.am         |    1 -
 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            |    1 +
 9 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 75372fc..1b799fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,8 @@ AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 dnl Checks for libraries.
-AC_CHECK_LIB(dl, dlopen)
+AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
+AC_SUBST([libdl_LIBS])
 AC_CHECK_HEADER(pcap.h,HAVE_PCAP_H=true)
 
 dnl Checks for header files.
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 7fd8979..2e972f8 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -1,7 +1,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
-LIBS=
 
 pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la ulogd_inppkt_UNIXSOCK.la
 
diff --git a/output/Makefile.am b/output/Makefile.am
index 34ffb2d..9d9ac73 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,6 +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 1ee8f2a..f413cab 100644
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -1,13 +1,13 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include $(DBI_INC)
 AM_CFLAGS = ${regular_CFLAGS}
-LIBS=$(DBI_LIB)
 
 if HAVE_DBI
 
 pkglib_LTLIBRARIES = ulogd_output_DBI.la
 
 ulogd_output_DBI_la_SOURCES = ulogd_output_DBI.c ../../util/db.c
+ulogd_output_DBI_la_LIBADD  = ${DBI_LIB}
 ulogd_output_DBI_la_LDFLAGS = -avoid-version -module
 
 endif
diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index a98cdeb..c24208c 100644
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -1,12 +1,12 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include $(MYSQL_INC)
 AM_CFLAGS = ${regular_CFLAGS}
-LIBS=$(MYSQL_LIB)
 
 if HAVE_MYSQL
 
 pkglib_LTLIBRARIES = ulogd_output_MYSQL.la
 
 ulogd_output_MYSQL_la_SOURCES = ulogd_output_MYSQL.c ../../util/db.c
+ulogd_output_MYSQL_la_LIBADD  = ${MYSQL_LIB}
 ulogd_output_MYSQL_la_LDFLAGS = -avoid-version -module
 
 endif
diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index 59cb3f6..47580d2 100644
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -1,13 +1,13 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include $(PCAP_INC)
 AM_CFLAGS = ${regular_CFLAGS}
-LIBS=$(PCAP_LIB)
 
 if HAVE_PCAP
 
 pkglib_LTLIBRARIES = ulogd_output_PCAP.la
 
 ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c
+ulogd_output_PCAP_la_LIBADD  = ${PCAP_LIB}
 ulogd_output_PCAP_la_LDFLAGS = -avoid-version -module
 
 endif
diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index 32be79b..bdaf1d2 100644
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -1,13 +1,13 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(PQINCPATH)
 AM_CFLAGS = ${regular_CFLAGS}
-LIBS=$(PQLIBS)
 
 if HAVE_PGSQL
 
 pkglib_LTLIBRARIES = ulogd_output_PGSQL.la
 
 ulogd_output_PGSQL_la_SOURCES = ulogd_output_PGSQL.c ../../util/db.c
+ulogd_output_PGSQL_la_LIBADD  = ${PQLIBS}
 ulogd_output_PGSQL_la_LDFLAGS = -avoid-version -module
 
 endif
diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index d14398c..3bfec2e 100644
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -1,12 +1,12 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include $(SQLITE3_INC)
 AM_CFLAGS = ${regular_CFLAGS}
-LIBS=$(SQLITE3_LIB)
 
 if HAVE_SQLITE3
 
 pkglib_LTLIBRARIES = ulogd_output_SQLITE3.la
 
 ulogd_output_SQLITE3_la_SOURCES = ulogd_output_SQLITE3.c ../../util/db.c
+ulogd_output_SQLITE3_la_LIBADD  = ${SQLITE3_LIBS}
 ulogd_output_SQLITE3_la_LDFLAGS = -avoid-version -module
 
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 9ae7884..115ddd5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,4 +7,5 @@ AM_CFLAGS = ${regular_CFLAGS}
 sbin_PROGRAMS = ulogd
 
 ulogd_SOURCES = ulogd.c select.c timer.c rbtree.c conffile.c hash.c
+ulogd_LDADD   = ${libdl_LIBS}
 ulogd_LDFLAGS = -export-dynamic
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/3] build: use appropriate location for program modules
  2011-02-02 21:51 ulogd2: build fixes Jan Engelhardt
  2011-02-02 21:51 ` [PATCH 1/3] build: avoid use of LIBS variable Jan Engelhardt
@ 2011-02-02 21:51 ` Jan Engelhardt
  2011-02-02 21:51 ` [PATCH 3/3] build: use compile/link information from pkgconfig Jan Engelhardt
  2011-02-03 17:17 ` ulogd2: build fixes Pablo Neira Ayuso
  3 siblings, 0 replies; 5+ messages in thread
From: Jan Engelhardt @ 2011-02-02 21:51 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Modules - since they are dependent on the executable - generally go to
libexec/.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 Makefile.am                   |    2 +-
 configure.ac                  |    2 +-
 filter/Makefile.am            |    8 +++---
 filter/raw2packet/Makefile.am |    2 +-
 input/flow/Makefile.am        |    2 +-
 input/packet/Makefile.am      |    3 +-
 output/Makefile.am            |    6 ++--
 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 +-
 ulogd.conf.in                 |   42 ++++++++++++++++++++--------------------
 13 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d4c180b..35e0338 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = include libipulog src input filter output
 noinst_DATA = ulogd.conf
 
 edit = sed \
-	-e 's,@libdir\@,$(libdir),g'
+	-e 's,@pkglibexecdir\@,${pkglibexecdir},g'
 
 ulogd.conf: Makefile $(srcdir)/ulogd.conf.in
 	$(edit) $(srcdir)/ulogd.conf.in >ulogd.conf
diff --git a/configure.ac b/configure.ac
index 1b799fe..8a92824 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 foreign dist-bzip2 1.6])
+AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 1.10b])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 3c3f152..83a0e52 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -3,10 +3,10 @@ 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 \
-		     ulogd_filter_IP2STR.la ulogd_filter_IP2BIN.la \
-		     ulogd_filter_HWHDR.la ulogd_filter_MARK.la
+pkglibexec_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
+			 ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \
+			 ulogd_filter_IP2STR.la ulogd_filter_IP2BIN.la \
+			 ulogd_filter_HWHDR.la ulogd_filter_MARK.la
 
 ulogd_filter_IFINDEX_la_SOURCES = ulogd_filter_IFINDEX.c
 ulogd_filter_IFINDEX_la_LDFLAGS = -avoid-version -module -lnfnetlink
diff --git a/filter/raw2packet/Makefile.am b/filter/raw2packet/Makefile.am
index 8b5a4ad..a39f3ae 100644
--- a/filter/raw2packet/Makefile.am
+++ b/filter/raw2packet/Makefile.am
@@ -2,7 +2,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
 
-pkglib_LTLIBRARIES = ulogd_raw2packet_BASE.la 
+pkglibexec_LTLIBRARIES = ulogd_raw2packet_BASE.la 
 
 ulogd_raw2packet_BASE_la_SOURCES = ulogd_raw2packet_BASE.c
 ulogd_raw2packet_BASE_la_LDFLAGS = -avoid-version -module
diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 127caf6..eaa1644 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -2,7 +2,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
 
-pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
+pkglibexec_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
 
 ulogd_inpflow_NFCT_la_SOURCES = ulogd_inpflow_NFCT.c
 ulogd_inpflow_NFCT_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 2e972f8..d4ca449 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -2,7 +2,8 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
 
-pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la ulogd_inppkt_UNIXSOCK.la
+pkglibexec_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la \
+			 ulogd_inppkt_UNIXSOCK.la
 
 ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c
 ulogd_inppkt_NFLOG_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_LOG_LIBS)
diff --git a/output/Makefile.am b/output/Makefile.am
index 9d9ac73..3811dad 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -3,9 +3,9 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 SUBDIRS= pcap mysql pgsql sqlite3 dbi
 
-pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
-		     ulogd_output_OPRINT.la \
-		     ulogd_output_NACCT.la ulogd_output_XML.la
+pkglibexec_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
+			 ulogd_output_OPRINT.la \
+			 ulogd_output_NACCT.la ulogd_output_XML.la
 
 ulogd_output_LOGEMU_la_SOURCES = ulogd_output_LOGEMU.c
 ulogd_output_LOGEMU_la_LDFLAGS = -avoid-version -module
diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am
index f413cab..ca05e00 100644
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_DBI
 
-pkglib_LTLIBRARIES = ulogd_output_DBI.la
+pkglibexec_LTLIBRARIES = ulogd_output_DBI.la
 
 ulogd_output_DBI_la_SOURCES = ulogd_output_DBI.c ../../util/db.c
 ulogd_output_DBI_la_LIBADD  = ${DBI_LIB}
diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index c24208c..5c3afbb 100644
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_MYSQL
 
-pkglib_LTLIBRARIES = ulogd_output_MYSQL.la
+pkglibexec_LTLIBRARIES = ulogd_output_MYSQL.la
 
 ulogd_output_MYSQL_la_SOURCES = ulogd_output_MYSQL.c ../../util/db.c
 ulogd_output_MYSQL_la_LIBADD  = ${MYSQL_LIB}
diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index 47580d2..54c6da3 100644
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_PCAP
 
-pkglib_LTLIBRARIES = ulogd_output_PCAP.la
+pkglibexec_LTLIBRARIES = ulogd_output_PCAP.la
 
 ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c
 ulogd_output_PCAP_la_LIBADD  = ${PCAP_LIB}
diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index bdaf1d2..32b3ea2 100644
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_PGSQL
 
-pkglib_LTLIBRARIES = ulogd_output_PGSQL.la
+pkglibexec_LTLIBRARIES = ulogd_output_PGSQL.la
 
 ulogd_output_PGSQL_la_SOURCES = ulogd_output_PGSQL.c ../../util/db.c
 ulogd_output_PGSQL_la_LIBADD  = ${PQLIBS}
diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index 3bfec2e..507dbfc 100644
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_SQLITE3
 
-pkglib_LTLIBRARIES = ulogd_output_SQLITE3.la
+pkglibexec_LTLIBRARIES = ulogd_output_SQLITE3.la
 
 ulogd_output_SQLITE3_la_SOURCES = ulogd_output_SQLITE3.c ../../util/db.c
 ulogd_output_SQLITE3_la_LIBADD  = ${SQLITE3_LIBS}
diff --git a/ulogd.conf.in b/ulogd.conf.in
index 634e37f..268818f 100644
--- a/ulogd.conf.in
+++ b/ulogd.conf.in
@@ -25,27 +25,27 @@ loglevel=1
 # 2. options for each plugin in seperate section below
 
 
-plugin="@libdir@/ulogd/ulogd_inppkt_NFLOG.so"
-#plugin="@libdir@/ulogd/ulogd_inppkt_ULOG.so"
-#plugin="@libdir@/ulogd/ulogd_inppkt_UNIXSOCK.so"
-plugin="@libdir@/ulogd/ulogd_inpflow_NFCT.so"
-plugin="@libdir@/ulogd/ulogd_filter_IFINDEX.so"
-plugin="@libdir@/ulogd/ulogd_filter_IP2STR.so"
-plugin="@libdir@/ulogd/ulogd_filter_IP2BIN.so"
-plugin="@libdir@/ulogd/ulogd_filter_PRINTPKT.so"
-plugin="@libdir@/ulogd/ulogd_filter_HWHDR.so"
-plugin="@libdir@/ulogd/ulogd_filter_PRINTFLOW.so"
-#plugin="@libdir@/ulogd/ulogd_filter_MARK.so"
-plugin="@libdir@/ulogd/ulogd_output_LOGEMU.so"
-plugin="@libdir@/ulogd/ulogd_output_SYSLOG.so"
-plugin="@libdir@/ulogd/ulogd_output_XML.so"
-#plugin="@libdir@/ulogd/ulogd_output_OPRINT.so"
-#plugin="@libdir@/ulogd/ulogd_output_NACCT.so"
-#plugin="@libdir@/ulogd/ulogd_output_PCAP.so"
-#plugin="@libdir@/ulogd/ulogd_output_PGSQL.so"
-#plugin="@libdir@/ulogd/ulogd_output_MYSQL.so"
-#plugin="@libdir@/ulogd/ulogd_output_DBI.so"
-plugin="@libdir@/ulogd/ulogd_raw2packet_BASE.so"
+plugin="@pkglibexecdir@/ulogd_inppkt_NFLOG.so"
+#plugin="@pkglibexecdir@/ulogd_inppkt_ULOG.so"
+#plugin="@pkglibexecdir@/ulogd_inppkt_UNIXSOCK.so"
+plugin="@pkglibexecdir@/ulogd_inpflow_NFCT.so"
+plugin="@pkglibexecdir@/ulogd_filter_IFINDEX.so"
+plugin="@pkglibexecdir@/ulogd_filter_IP2STR.so"
+plugin="@pkglibexecdir@/ulogd_filter_IP2BIN.so"
+plugin="@pkglibexecdir@/ulogd_filter_PRINTPKT.so"
+plugin="@pkglibexecdir@/ulogd_filter_HWHDR.so"
+plugin="@pkglibexecdir@/ulogd_filter_PRINTFLOW.so"
+#plugin="@pkglibexecdir@/ulogd_filter_MARK.so"
+plugin="@pkglibexecdir@/ulogd_output_LOGEMU.so"
+plugin="@pkglibexecdir@/ulogd_output_SYSLOG.so"
+plugin="@pkglibexecdir@/ulogd_output_XML.so"
+#plugin="@pkglibexecdir@/ulogd_output_OPRINT.so"
+#plugin="@pkglibexecdir@/ulogd_output_NACCT.so"
+#plugin="@pkglibexecdir@/ulogd_output_PCAP.so"
+#plugin="@pkglibexecdir@/ulogd_output_PGSQL.so"
+#plugin="@pkglibexecdir@/ulogd_output_MYSQL.so"
+#plugin="@pkglibexecdir@/ulogd_output_DBI.so"
+plugin="@pkglibexecdir@/ulogd_raw2packet_BASE.so"
 
 # this is a stack for logging packet send by system via LOGEMU
 #stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 3/3] build: use compile/link information from pkgconfig
  2011-02-02 21:51 ulogd2: build fixes Jan Engelhardt
  2011-02-02 21:51 ` [PATCH 1/3] build: avoid use of LIBS variable Jan Engelhardt
  2011-02-02 21:51 ` [PATCH 2/3] build: use appropriate location for program modules Jan Engelhardt
@ 2011-02-02 21:51 ` Jan Engelhardt
  2011-02-03 17:17 ` ulogd2: build fixes Pablo Neira Ayuso
  3 siblings, 0 replies; 5+ messages in thread
From: Jan Engelhardt @ 2011-02-02 21:51 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

This is important for when the libraries are in a non-default path.
Also, libs must be listed in LDADD/LIBADD, not LDFLAGS.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 filter/Makefile.am |    5 +++--
 output/Makefile.am |    8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/filter/Makefile.am b/filter/Makefile.am
index 83a0e52..ee0a722 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = raw2packet packet2flow
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CFLAGS = ${regular_CFLAGS} ${LIBNFNETLINK_CFLAGS}
 
 pkglibexec_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
 			 ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \
@@ -9,7 +9,8 @@ pkglibexec_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
 			 ulogd_filter_HWHDR.la ulogd_filter_MARK.la
 
 ulogd_filter_IFINDEX_la_SOURCES = ulogd_filter_IFINDEX.c
-ulogd_filter_IFINDEX_la_LDFLAGS = -avoid-version -module -lnfnetlink
+ulogd_filter_IFINDEX_la_LDFLAGS = -avoid-version -module
+ulogd_filter_IFINDEX_la_LIBADD  = ${LIBNFNETLINK_LIBS}
 
 ulogd_filter_PWSNIFF_la_SOURCES = ulogd_filter_PWSNIFF.c
 ulogd_filter_PWSNIFF_la_LDFLAGS = -avoid-version -module
diff --git a/output/Makefile.am b/output/Makefile.am
index 3811dad..2ec6e8d 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \
+	    ${LIBNETFILTER_CONNTRACK_CFLAGS}
 
 SUBDIRS= pcap mysql pgsql sqlite3 dbi
 
@@ -20,5 +21,6 @@ ulogd_output_NACCT_la_SOURCES = ulogd_output_NACCT.c
 ulogd_output_NACCT_la_LDFLAGS = -avoid-version -module
 
 ulogd_output_XML_la_SOURCES = ulogd_output_XML.c
-ulogd_output_XML_la_LDFLAGS = -avoid-version -module -lnetfilter_log \
-			      -lnetfilter_conntrack
+ulogd_output_XML_la_LIBADD  = ${LIBNETFILTER_LOG_LIBS} \
+			      ${LIBNETFILTER_CONNTRACK_LIBS}
+ulogd_output_XML_la_LDFLAGS = -avoid-version -module
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: ulogd2: build fixes
  2011-02-02 21:51 ulogd2: build fixes Jan Engelhardt
                   ` (2 preceding siblings ...)
  2011-02-02 21:51 ` [PATCH 3/3] build: use compile/link information from pkgconfig Jan Engelhardt
@ 2011-02-03 17:17 ` Pablo Neira Ayuso
  3 siblings, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2011-02-03 17:17 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: netfilter-devel

On 02/02/11 22:51, Jan Engelhardt wrote:
> The following changes since commit 4f652cc32aebeac20f46009f146ad973a1ed0e99:
> 
>   NFCT: fix bug in polling mode (2010-12-09 12:02:15 +0100)
> 
> are available in the git repository at:
>   git://dev.medozas.de/ulogd2 master
> 
> Jan Engelhardt (3):
>       build: avoid use of LIBS variable
>       build: use appropriate location for program modules
>       build: use compile/link information from pkgconfig

Pulled and pushed out, thanks!

> Pablo Neira Ayuso (1):
>       ulogd: fix double call of stop for reused input plugins

Hm, this seems to have slipped through :-)


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-03 17:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-02 21:51 ulogd2: build fixes Jan Engelhardt
2011-02-02 21:51 ` [PATCH 1/3] build: avoid use of LIBS variable Jan Engelhardt
2011-02-02 21:51 ` [PATCH 2/3] build: use appropriate location for program modules Jan Engelhardt
2011-02-02 21:51 ` [PATCH 3/3] build: use compile/link information from pkgconfig Jan Engelhardt
2011-02-03 17:17 ` ulogd2: build fixes Pablo Neira Ayuso

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.