* [ulogd2 PATCH 01/13] gitignore: Add Emacs artefacts
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 02/13] gitignore: ignore util/.dirstamp Jeremy Sowden
` (11 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index 0ff56cfe0423..3f218218dfc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+*~
+.\#*
+\#*\#
# global
*.la
*.lo
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 02/13] gitignore: ignore util/.dirstamp
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 01/13] gitignore: Add Emacs artefacts Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 17:05 ` Jan Engelhardt
2021-10-30 16:01 ` [ulogd2 PATCH 03/13] build: remove unused Makefile fragment Jeremy Sowden
` (10 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 3f218218dfc9..fd2189de5748 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ TAGS
/doc/ulogd.*
!/doc/ulogd.sgml
ulogd.conf.5
+/util/.dirstamp
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [ulogd2 PATCH 02/13] gitignore: ignore util/.dirstamp
2021-10-30 16:01 ` [ulogd2 PATCH 02/13] gitignore: ignore util/.dirstamp Jeremy Sowden
@ 2021-10-30 17:05 ` Jan Engelhardt
2021-11-06 11:06 ` Jeremy Sowden
0 siblings, 1 reply; 22+ messages in thread
From: Jan Engelhardt @ 2021-10-30 17:05 UTC (permalink / raw)
To: Jeremy Sowden; +Cc: Netfilter Devel
On Saturday 2021-10-30 18:01, Jeremy Sowden wrote:
>Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
>---
> .gitignore | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/.gitignore b/.gitignore
>index 3f218218dfc9..fd2189de5748 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -27,3 +27,4 @@ TAGS
> /doc/ulogd.*
> !/doc/ulogd.sgml
> ulogd.conf.5
>+/util/.dirstamp
.dirstamp should be globally ignored, without a path anchor.
(Best shotgun hypothesis I have that this file is created whenever
a Makefile.am contains a '/' in some _SOURCES)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ulogd2 PATCH 02/13] gitignore: ignore util/.dirstamp
2021-10-30 17:05 ` Jan Engelhardt
@ 2021-11-06 11:06 ` Jeremy Sowden
0 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-11-06 11:06 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Netfilter Devel
[-- Attachment #1: Type: text/plain, Size: 983 bytes --]
On 2021-10-30, at 19:05:34 +0200, Jan Engelhardt wrote:
> On Saturday 2021-10-30 18:01, Jeremy Sowden wrote:
> > Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
> > ---
> > .gitignore | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/.gitignore b/.gitignore
> > index 3f218218dfc9..fd2189de5748 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -27,3 +27,4 @@ TAGS
> > /doc/ulogd.*
> > !/doc/ulogd.sgml
> > ulogd.conf.5
> > +/util/.dirstamp
>
> .dirstamp should be globally ignored, without a path anchor.
Will update in v2.
> (Best shotgun hypothesis I have that this file is created whenever
> a Makefile.am contains a '/' in some _SOURCES)
Yes, if the `subdir-objects` automake option is defined and there is a
source outside the current source directory (../../utils/db.c,
../util/printpkt.c and ../util/printflow.c, in this case), automake adds
a rule to create .dirstamp in order to make sure that the corresponding
build directory gets created.
J.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ulogd2 PATCH 03/13] build: remove unused Makefile fragment
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 01/13] gitignore: Add Emacs artefacts Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 02/13] gitignore: ignore util/.dirstamp Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 04/13] build: remove empty filter sub-directory Jeremy Sowden
` (9 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
.gitignore | 1 -
Rules.make.in | 43 -------------------------------------------
configure.ac | 2 +-
3 files changed, 1 insertion(+), 45 deletions(-)
delete mode 100644 Rules.make.in
diff --git a/.gitignore b/.gitignore
index fd2189de5748..10769b427fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ Makefile
Makefile.in
# this dir
-/Rules.make
/ulogd.conf
# build system
diff --git a/Rules.make.in b/Rules.make.in
deleted file mode 100644
index 21b05d9ca6ff..000000000000
--- a/Rules.make.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-
-PREFIX=@prefix@
-exec_prefix=@exec_prefix@
-ETCDIR=@sysconfdir@
-BINDIR=@sbindir@
-
-ULOGD_CONFIGFILE=@sysconfdir@/ulogd.conf
-
-ULOGD_LIB_PATH=@libdir@/ulogd
-
-# Path of libipulog (from iptables)
-LIBIPULOG=@top_srcdir@/libipulog
-INCIPULOG=-I@top_srcdir@/libipulog/include
-INCCONFFILE=-I@top_srcdir@/conffile
-
-CC=@CC@
-LD=@LD@
-INSTALL=@INSTALL@
-
-CFLAGS=@CFLAGS@ @CPPFLAGS@ -Wall
-CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\"
-# doesn't work for subdirs
-#CFLAGS+=$(INCIPULOG) $(INCCONFFILE)
-CFLAGS+=-I/lib/modules/`uname -r`/build/include
-#CFLAGS+=@DEFS@
-#CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL
-
-LIBS=@LIBS@
-
-
-# Names of the plugins to be compiled
-ULOGD_SL:=BASE OPRINT PWSNIFF LOGEMU LOCAL SYSLOG
-
-# mysql output support
-#ULOGD_SL+=MYSQL
-MYSQL_CFLAGS=-I@MYSQLINCLUDES@ @EXTRA_MYSQL_DEF@
-MYSQL_LDFLAGS=@DATABASE_LIB_DIR@ @MYSQL_LIB@
-
-# postgreSQL output support
-#ULOGD_SL+=PGSQL
-PGSQL_CFLAGS=-I@PGSQLINCLUDES@ @EXTRA_PGSQL_DEF@
-PGSQL_LDFLAGS=@DATABASE_LIB_DIR@ @PGSQL_LIB@
diff --git a/configure.ac b/configure.ac
index 48b4995f148c..e341ad12a159 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,7 @@ AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefi
filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \
output/dbi/Makefile output/ipfix/Makefile \
- src/Makefile Makefile Rules.make)
+ src/Makefile Makefile)
AC_OUTPUT
define([EXPAND_VARIABLE],
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 04/13] build: remove empty filter sub-directory
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (2 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 03/13] build: remove unused Makefile fragment Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 05/13] build: move cpp flag to the only Makefile.am file where it's needed Jeremy Sowden
` (8 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
The only file in filter/packet2flow is an empty Makefile.am. Remove it.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 2 +-
filter/Makefile.am | 2 +-
filter/packet2flow/Makefile.am | 0
3 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 filter/packet2flow/Makefile.am
diff --git a/configure.ac b/configure.ac
index e341ad12a159..4e502171292e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,7 @@ AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefi
include/linux/netfilter_ipv4/Makefile libipulog/Makefile \
input/Makefile input/packet/Makefile input/flow/Makefile \
input/sum/Makefile \
- filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
+ filter/Makefile filter/raw2packet/Makefile \
output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \
output/dbi/Makefile output/ipfix/Makefile \
src/Makefile Makefile)
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 875850b8ae90..c2755ecb7c49 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = raw2packet packet2flow
+SUBDIRS = raw2packet
AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNFNETLINK_CFLAGS}
AM_CFLAGS = ${regular_CFLAGS}
diff --git a/filter/packet2flow/Makefile.am b/filter/packet2flow/Makefile.am
deleted file mode 100644
index e69de29bb2d1..000000000000
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 05/13] build: move cpp flag to the only Makefile.am file where it's needed
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (3 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 04/13] build: remove empty filter sub-directory Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 06/13] build: add Make_global.am for common flags and include it where necessary Jeremy Sowden
` (7 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 2 +-
src/Makefile.am | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4e502171292e..1d795bad325d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,7 @@ AC_ARG_WITH([ulogd2libdir],
[ulogd2libdir="${libdir}/ulogd"])
AC_SUBST([ulogd2libdir])
-regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter -DULOGD2_LIBDIR=\\\"\${ulogd2libdir}\\\"";
+regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter";
AC_SUBST([regular_CFLAGS])
dnl AC_SUBST(DATABASE_DIR)
diff --git a/src/Makefile.am b/src/Makefile.am
index 998e776a8079..e1d45aee4b6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
AM_CPPFLAGS = -I$(top_srcdir)/include \
- -DULOGD_CONFIGFILE="\"$(sysconfdir)/ulogd.conf\"" \
- -DULOGD_LOGFILE_DEFAULT="\"$(localstatedir)/log/ulogd.log\""
+ -DULOGD_CONFIGFILE='"$(sysconfdir)/ulogd.conf"' \
+ -DULOGD_LOGFILE_DEFAULT='"$(localstatedir)/log/ulogd.log"' \
+ -DULOGD2_LIBDIR='"$(ulogd2libdir)"'
AM_CFLAGS = ${regular_CFLAGS}
sbin_PROGRAMS = ulogd
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 06/13] build: add Make_global.am for common flags and include it where necessary
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (4 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 05/13] build: move cpp flag to the only Makefile.am file where it's needed Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 07/13] build: use `dist_man_MANS` Jeremy Sowden
` (6 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
Make_global.am | 2 ++
Makefile.am | 7 ++-----
configure.ac | 3 ---
filter/Makefile.am | 5 +++--
filter/raw2packet/Makefile.am | 4 +---
include/libipulog/Makefile.am | 1 -
include/ulogd/Makefile.am | 1 -
input/Makefile.am | 1 -
input/flow/Makefile.am | 4 ++--
input/packet/Makefile.am | 4 ++--
input/sum/Makefile.am | 6 ++++--
libipulog/Makefile.am | 4 +---
output/Makefile.am | 10 ++++++----
output/dbi/Makefile.am | 4 ++--
output/ipfix/Makefile.am | 3 +--
output/mysql/Makefile.am | 5 +++--
output/pcap/Makefile.am | 4 +---
output/pgsql/Makefile.am | 4 ++--
output/sqlite3/Makefile.am | 5 +++--
src/Makefile.am | 9 ++++-----
20 files changed, 39 insertions(+), 47 deletions(-)
create mode 100644 Make_global.am
diff --git a/Make_global.am b/Make_global.am
new file mode 100644
index 000000000000..4ce896d06d70
--- /dev/null
+++ b/Make_global.am
@@ -0,0 +1,2 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = -Wall -Wextra -Wno-unused-parameter
diff --git a/Makefile.am b/Makefile.am
index 5600f8c6f552..838d6ec29156 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,11 @@
+ACLOCAL_AMFLAGS = -I m4
-ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = include libipulog src input filter output
man_MANS = ulogd.8
EXTRA_DIST = $(man_MANS) ulogd.conf.in doc
-AM_CPPFLAGS = -I$(top_srcdir)/include
-SUBDIRS = include libipulog src input filter output
-
noinst_DATA = ulogd.conf
edit = sed \
@@ -18,4 +16,3 @@ ulogd.conf: Makefile $(srcdir)/ulogd.conf.in
dist-hook:
rm -f ulogd.conf
-
diff --git a/configure.ac b/configure.ac
index 1d795bad325d..f7d6b50c47f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,9 +157,6 @@ AC_ARG_WITH([ulogd2libdir],
[ulogd2libdir="${libdir}/ulogd"])
AC_SUBST([ulogd2libdir])
-regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter";
-AC_SUBST([regular_CFLAGS])
-
dnl AC_SUBST(DATABASE_DIR)
dnl AC_SUBST(DATABASE_LIB)
dnl AC_SUBST(DATABASE_LIB_DIR)
diff --git a/filter/Makefile.am b/filter/Makefile.am
index c2755ecb7c49..f1d2c81f48d4 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,7 +1,8 @@
SUBDIRS = raw2packet
-AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNFNETLINK_CFLAGS}
-AM_CFLAGS = ${regular_CFLAGS}
+include $(top_srcdir)/Make_global.am
+
+AM_CPPFLAGS += ${LIBNFNETLINK_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 7498f9aa3c55..90768ef6ca0e 100644
--- a/filter/raw2packet/Makefile.am
+++ b/filter/raw2packet/Makefile.am
@@ -1,6 +1,4 @@
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS}
+include $(top_srcdir)/Make_global.am
pkglib_LTLIBRARIES = ulogd_raw2packet_BASE.la
diff --git a/include/libipulog/Makefile.am b/include/libipulog/Makefile.am
index a98f941a781d..80d16b1b22a0 100644
--- a/include/libipulog/Makefile.am
+++ b/include/libipulog/Makefile.am
@@ -1,2 +1 @@
-
noinst_HEADERS = libipulog.h
diff --git a/include/ulogd/Makefile.am b/include/ulogd/Makefile.am
index 5e6aa75606f9..e4b41c4f3d19 100644
--- a/include/ulogd/Makefile.am
+++ b/include/ulogd/Makefile.am
@@ -1,2 +1 @@
-
noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h ulogd.h printpkt.h printflow.h common.h linux_rbtree.h timer.h slist.h hash.h jhash.h addr.h
diff --git a/input/Makefile.am b/input/Makefile.am
index 5ffef1b4e711..8f2e934fcdfa 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -1,2 +1 @@
-
SUBDIRS = packet flow sum
diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 0e07a7dc1ccc..004e532981a4 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -1,6 +1,6 @@
+include $(top_srcdir)/Make_global.am
-AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_CONNTRACK_CFLAGS}
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CPPFLAGS += ${LIBNETFILTER_CONNTRACK_CFLAGS}
if BUILD_NFCT
pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 1c3151d52f13..daf374a65917 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -1,6 +1,6 @@
+include $(top_srcdir)/Make_global.am
-AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_LOG_CFLAGS}
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CPPFLAGS += ${LIBNETFILTER_LOG_CFLAGS}
pkglib_LTLIBRARIES = ulogd_inppkt_UNIXSOCK.la
diff --git a/input/sum/Makefile.am b/input/sum/Makefile.am
index b6ddb4d29b93..e0c42f7de376 100644
--- a/input/sum/Makefile.am
+++ b/input/sum/Makefile.am
@@ -1,5 +1,7 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBNETFILTER_ACCT_CFLAGS) $(LIBMNL_CFLAGS)
-AM_CFLAGS = ${regular_CFLAGS}
+include $(top_srcdir)/Make_global.am
+
+AM_CPPFLAGS += $(LIBNETFILTER_ACCT_CFLAGS) $(LIBMNL_CFLAGS)
+
if BUILD_NFACCT
pkglib_LTLIBRARIES = ulogd_inpflow_NFACCT.la
ulogd_inpflow_NFACCT_la_SOURCES = ulogd_inpflow_NFACCT.c
diff --git a/libipulog/Makefile.am b/libipulog/Makefile.am
index 111cd4889ed6..708975a5fb99 100644
--- a/libipulog/Makefile.am
+++ b/libipulog/Makefile.am
@@ -1,6 +1,4 @@
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS}
+include $(top_srcdir)/Make_global.am
noinst_LTLIBRARIES = libipulog.la
diff --git a/output/Makefile.am b/output/Makefile.am
index 7ba821764afe..2b7d12b12be3 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,9 +1,11 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS} \
- ${LIBNETFILTER_CONNTRACK_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS}
-AM_CFLAGS = ${regular_CFLAGS}
-
SUBDIRS= pcap mysql pgsql sqlite3 dbi ipfix
+include $(top_srcdir)/Make_global.am
+
+AM_CPPFLAGS += ${LIBNETFILTER_ACCT_CFLAGS} \
+ ${LIBNETFILTER_CONNTRACK_CFLAGS} \
+ ${LIBNETFILTER_LOG_CFLAGS}
+
pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
ulogd_output_OPRINT.la ulogd_output_GPRINT.la \
ulogd_output_NACCT.la ulogd_output_XML.la \
diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am
index f413cab4a340..38db0a26fd84 100644
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -1,6 +1,6 @@
+include $(top_srcdir)/Make_global.am
-AM_CPPFLAGS = -I$(top_srcdir)/include $(DBI_INC)
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CPPFLAGS += $(DBI_INC)
if HAVE_DBI
diff --git a/output/ipfix/Makefile.am b/output/ipfix/Makefile.am
index cacda265c1f5..7354f6be6d51 100644
--- a/output/ipfix/Makefile.am
+++ b/output/ipfix/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = $(regular_CFLAGS)
+include $(top_srcdir)/Make_global.am
pkglib_LTLIBRARIES = ulogd_output_IPFIX.la
diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index c24208c3e302..3839a135c926 100644
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -1,5 +1,6 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include $(MYSQL_INC)
-AM_CFLAGS = ${regular_CFLAGS}
+include $(top_srcdir)/Make_global.am
+
+AM_CPPFLAGS += $(MYSQL_INC)
if HAVE_MYSQL
diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index c1723a642a63..a022bf0cc15c 100644
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -1,6 +1,4 @@
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS}
+include $(top_srcdir)/Make_global.am
if HAVE_PCAP
diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index bdaf1d249dce..fbc0d04c9f11 100644
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -1,6 +1,6 @@
+include $(top_srcdir)/Make_global.am
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(PQINCPATH)
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CPPFLAGS += -I$(PQINCPATH)
if HAVE_PGSQL
diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index 62af267c4108..e00e1d6cf11c 100644
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -1,5 +1,6 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include ${libsqlite3_CFLAGS}
-AM_CFLAGS = ${regular_CFLAGS}
+include $(top_srcdir)/Make_global.am
+
+AM_CPPFLAGS += ${libsqlite3_CFLAGS}
if HAVE_SQLITE3
diff --git a/src/Makefile.am b/src/Makefile.am
index e1d45aee4b6c..7a12a72da9a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,8 @@
+include $(top_srcdir)/Make_global.am
-AM_CPPFLAGS = -I$(top_srcdir)/include \
- -DULOGD_CONFIGFILE='"$(sysconfdir)/ulogd.conf"' \
- -DULOGD_LOGFILE_DEFAULT='"$(localstatedir)/log/ulogd.log"' \
- -DULOGD2_LIBDIR='"$(ulogd2libdir)"'
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CPPFLAGS += -DULOGD_CONFIGFILE='"$(sysconfdir)/ulogd.conf"' \
+ -DULOGD_LOGFILE_DEFAULT='"$(localstatedir)/log/ulogd.log"' \
+ -DULOGD2_LIBDIR='"$(ulogd2libdir)"'
sbin_PROGRAMS = ulogd
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 07/13] build: use `dist_man_MANS`
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (5 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 06/13] build: add Make_global.am for common flags and include it where necessary Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 08/13] build: only conditionally enter sub-directories containing optional code Jeremy Sowden
` (5 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 838d6ec29156..60cf8c6c595f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = include libipulog src input filter output
-man_MANS = ulogd.8
+dist_man_MANS = ulogd.8
-EXTRA_DIST = $(man_MANS) ulogd.conf.in doc
+EXTRA_DIST = ulogd.conf.in doc
noinst_DATA = ulogd.conf
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 08/13] build: only conditionally enter sub-directories containing optional code
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (6 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 07/13] build: use `dist_man_MANS` Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 17:15 ` Jan Engelhardt
2021-10-30 16:01 ` [ulogd2 PATCH 09/13] build: move library dependencies from LDFLAGS to LIBADD Jeremy Sowden
` (4 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Currently, make enters all sub-directories containing source-code, even if they
only contain optional targets which are not configured to be built. Instead,
change the Makefiles so that the sub-directories are optional, rather than the
targets.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
input/Makefile.am | 10 +++++++++-
input/flow/Makefile.am | 2 --
input/sum/Makefile.am | 3 +--
output/Makefile.am | 33 +++++++++++++++++++++++++++++----
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 ----
9 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/input/Makefile.am b/input/Makefile.am
index 8f2e934fcdfa..668fc2b1444a 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -1 +1,9 @@
-SUBDIRS = packet flow sum
+if BUILD_NFCT
+ OPT_SUBDIR_FLOW = flow
+endif
+
+if BUILD_NFACCT
+ OPT_SUBDIR_SUM = sum
+endif
+
+SUBDIRS = packet $(OPT_SUBDIR_FLOW) $(OPT_SUBDIR_SUM)
diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 004e532981a4..2171a0cd80c8 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -2,12 +2,10 @@ include $(top_srcdir)/Make_global.am
AM_CPPFLAGS += ${LIBNETFILTER_CONNTRACK_CFLAGS}
-if BUILD_NFCT
pkglib_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)
-endif
#ulogd_inpflow_IPFIX_la_SOURCES = ulogd_inpflow_IPFIX.c
#ulogd_inpflow_IPFIX_la_LDFLAGS = -avoid-version -module
diff --git a/input/sum/Makefile.am b/input/sum/Makefile.am
index e0c42f7de376..b24af7b5606c 100644
--- a/input/sum/Makefile.am
+++ b/input/sum/Makefile.am
@@ -2,9 +2,8 @@ include $(top_srcdir)/Make_global.am
AM_CPPFLAGS += $(LIBNETFILTER_ACCT_CFLAGS) $(LIBMNL_CFLAGS)
-if BUILD_NFACCT
pkglib_LTLIBRARIES = ulogd_inpflow_NFACCT.la
+
ulogd_inpflow_NFACCT_la_SOURCES = ulogd_inpflow_NFACCT.c
ulogd_inpflow_NFACCT_la_LDFLAGS = -avoid-version -module
ulogd_inpflow_NFACCT_la_LIBADD = $(LIBMNL_LIBS) $(LIBNETFILTER_ACCT_LIBS)
-endif
diff --git a/output/Makefile.am b/output/Makefile.am
index 2b7d12b12be3..981ff0a30808 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,4 +1,29 @@
-SUBDIRS= pcap mysql pgsql sqlite3 dbi ipfix
+if HAVE_PCAP
+ OPT_SUBDIR_PCAP = pcap
+endif
+
+if HAVE_MYSQL
+ OPT_SUBDIR_MYSQL = mysql
+endif
+
+if HAVE_PGSQL
+ OPT_SUBDIR_PGSQL = pgsql
+endif
+
+if HAVE_SQLITE3
+ OPT_SUBDIR_SQLITE3 = sqlite3
+endif
+
+if HAVE_DBI
+ OPT_SUBDIR_DBI = dbi
+endif
+
+SUBDIRS = $(OPT_SUBDIR_PCAP) \
+ $(OPT_SUBDIR_MYSQL) \
+ $(OPT_SUBDIR_PGSQL) \
+ $(OPT_SUBDIR_SQLITE3) \
+ $(OPT_SUBDIR_DBI) \
+ ipfix
include $(top_srcdir)/Make_global.am
@@ -7,9 +32,9 @@ AM_CPPFLAGS += ${LIBNETFILTER_ACCT_CFLAGS} \
${LIBNETFILTER_LOG_CFLAGS}
pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
- ulogd_output_OPRINT.la ulogd_output_GPRINT.la \
- ulogd_output_NACCT.la ulogd_output_XML.la \
- ulogd_output_GRAPHITE.la
+ ulogd_output_OPRINT.la ulogd_output_GPRINT.la \
+ ulogd_output_NACCT.la ulogd_output_XML.la \
+ ulogd_output_GRAPHITE.la
if HAVE_JANSSON
pkglib_LTLIBRARIES += ulogd_output_JSON.la
diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am
index 38db0a26fd84..f8b0a9c68c78 100644
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -2,12 +2,8 @@ include $(top_srcdir)/Make_global.am
AM_CPPFLAGS += $(DBI_INC)
-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 3839a135c926..54abb9654eb7 100644
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -2,12 +2,8 @@ include $(top_srcdir)/Make_global.am
AM_CPPFLAGS += $(MYSQL_INC)
-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 a022bf0cc15c..9b4b3dde3a9c 100644
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -1,11 +1,7 @@
include $(top_srcdir)/Make_global.am
-if HAVE_PCAP
-
pkglib_LTLIBRARIES = ulogd_output_PCAP.la
ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c
ulogd_output_PCAP_la_LIBADD = ${libpcap_LIBS}
ulogd_output_PCAP_la_LDFLAGS = -avoid-version -module
-
-endif
diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index fbc0d04c9f11..9cdf22d7f765 100644
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -2,12 +2,8 @@ include $(top_srcdir)/Make_global.am
AM_CPPFLAGS += -I$(PQINCPATH)
-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 e00e1d6cf11c..72fd1a6a8db4 100644
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -2,12 +2,8 @@ include $(top_srcdir)/Make_global.am
AM_CPPFLAGS += ${libsqlite3_CFLAGS}
-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 = ${libsqlite3_LIBS}
ulogd_output_SQLITE3_la_LDFLAGS = -avoid-version -module
-
-endif
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 09/13] build: move library dependencies from LDFLAGS to LIBADD
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (7 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 08/13] build: only conditionally enter sub-directories containing optional code Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 10/13] build: update obsolete autoconf macros Jeremy Sowden
` (3 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Delete some commented out variables.
Move definitions of some variables related to conditionally built
libraries into the related conditionals.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
input/flow/Makefile.am | 8 +++-----
input/packet/Makefile.am | 19 ++++++++++---------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 2171a0cd80c8..a556b4e4cb90 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -2,10 +2,8 @@ include $(top_srcdir)/Make_global.am
AM_CPPFLAGS += ${LIBNETFILTER_CONNTRACK_CFLAGS}
-pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
+pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la
ulogd_inpflow_NFCT_la_SOURCES = ulogd_inpflow_NFCT.c
-ulogd_inpflow_NFCT_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)
-
-#ulogd_inpflow_IPFIX_la_SOURCES = ulogd_inpflow_IPFIX.c
-#ulogd_inpflow_IPFIX_la_LDFLAGS = -avoid-version -module
+ulogd_inpflow_NFCT_la_LDFLAGS = -avoid-version -module
+ulogd_inpflow_NFCT_la_LIBADD = $(LIBNETFILTER_CONNTRACK_LIBS)
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index daf374a65917..3aa01112084e 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -4,20 +4,21 @@ AM_CPPFLAGS += ${LIBNETFILTER_LOG_CFLAGS}
pkglib_LTLIBRARIES = ulogd_inppkt_UNIXSOCK.la
+ulogd_inppkt_UNIXSOCK_la_SOURCES = ulogd_inppkt_UNIXSOCK.c
+ulogd_inppkt_UNIXSOCK_la_LDFLAGS = -avoid-version -module
+
if BUILD_ULOG
pkglib_LTLIBRARIES += ulogd_inppkt_ULOG.la
+
+ulogd_inppkt_ULOG_la_SOURCES = ulogd_inppkt_ULOG.c
+ulogd_inppkt_ULOG_la_LDFLAGS = -avoid-version -module
+ulogd_inppkt_ULOG_la_LIBADD = ../../libipulog/libipulog.la
endif
if BUILD_NFLOG
pkglib_LTLIBRARIES += ulogd_inppkt_NFLOG.la
-endif
ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c
-ulogd_inppkt_NFLOG_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_LOG_LIBS)
-
-ulogd_inppkt_ULOG_la_SOURCES = ulogd_inppkt_ULOG.c
-ulogd_inppkt_ULOG_la_LDFLAGS = -avoid-version -module
-ulogd_inppkt_ULOG_la_LIBADD = ../../libipulog/libipulog.la
-
-ulogd_inppkt_UNIXSOCK_la_SOURCES = ulogd_inppkt_UNIXSOCK.c
-ulogd_inppkt_UNIXSOCK_la_LDFLAGS = -avoid-version -module
+ulogd_inppkt_NFLOG_la_LDFLAGS = -avoid-version -module
+ulogd_inppkt_NFLOG_la_LIBADD = $(LIBNETFILTER_LOG_LIBS)
+endif
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 10/13] build: update obsolete autoconf macros
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (8 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 09/13] build: move library dependencies from LDFLAGS to LIBADD Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 17:16 ` Jan Engelhardt
2021-10-30 16:01 ` [ulogd2 PATCH 11/13] build: quote and reformat some autoconf macro arguments Jeremy Sowden
` (2 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
`AC_CONFIG_HEADER` has been superseded by `+AC_CONFIG_HEADERS`.
`AC_PROG_LIBTOOL` has been superseded by `LT_INIT`.
`AC_DISABLE_STATIC` can be replaced by an argument to `LT_INIT`.
`AC_HEADER_STDC` is obsolete.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index f7d6b50c47f5..2dfeee6aa4cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([ulogd], [2.0.7])
AC_PREREQ([2.50])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b subdir-objects])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
@@ -14,8 +14,7 @@ dnl Checks for programs.
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_INSTALL
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_INIT([disable_static])
dnl Checks for libraries.
AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
@@ -23,7 +22,6 @@ AC_SUBST([libdl_LIBS])
dnl Checks for header files.
AC_HEADER_DIRENT
-AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h unistd.h)
dnl Checks for typedefs, structures, and compiler characteristics.
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [ulogd2 PATCH 10/13] build: update obsolete autoconf macros
2021-10-30 16:01 ` [ulogd2 PATCH 10/13] build: update obsolete autoconf macros Jeremy Sowden
@ 2021-10-30 17:16 ` Jan Engelhardt
2021-11-06 11:07 ` Jeremy Sowden
0 siblings, 1 reply; 22+ messages in thread
From: Jan Engelhardt @ 2021-10-30 17:16 UTC (permalink / raw)
To: Jeremy Sowden; +Cc: Netfilter Devel
On Saturday 2021-10-30 18:01, Jeremy Sowden wrote:
>+++ b/configure.ac
>@@ -3,7 +3,7 @@ AC_INIT([ulogd], [2.0.7])
> AC_PREREQ([2.50])
> AC_CONFIG_AUX_DIR([build-aux])
> AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b subdir-objects])
>-AC_CONFIG_HEADER([config.h])
>+AC_CONFIG_HEADERS([config.h])
> AC_CONFIG_MACRO_DIR([m4])
>
> m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
>@@ -14,8 +14,7 @@ dnl Checks for programs.
> AC_PROG_MAKE_SET
> AC_PROG_CC
> AC_PROG_INSTALL
>-AC_DISABLE_STATIC
>-AC_PROG_LIBTOOL
>+LT_INIT([disable_static])
This ought to be disable-static. Dash, not underscore.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ulogd2 PATCH 10/13] build: update obsolete autoconf macros
2021-10-30 17:16 ` Jan Engelhardt
@ 2021-11-06 11:07 ` Jeremy Sowden
0 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-11-06 11:07 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Netfilter Devel
[-- Attachment #1: Type: text/plain, Size: 738 bytes --]
On 2021-10-30, at 19:16:27 +0200, Jan Engelhardt wrote:
> On Saturday 2021-10-30 18:01, Jeremy Sowden wrote:
> > +++ b/configure.ac
> > @@ -3,7 +3,7 @@ AC_INIT([ulogd], [2.0.7])
> > AC_PREREQ([2.50])
> > AC_CONFIG_AUX_DIR([build-aux])
> > AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2
> 1.10b subdir-objects])
> > -AC_CONFIG_HEADER([config.h])
> > +AC_CONFIG_HEADERS([config.h])
> > AC_CONFIG_MACRO_DIR([m4])
> >
> > m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
> > @@ -14,8 +14,7 @@ dnl Checks for programs.
> > AC_PROG_MAKE_SET
> > AC_PROG_CC
> > AC_PROG_INSTALL
> > -AC_DISABLE_STATIC
> > -AC_PROG_LIBTOOL
> > +LT_INIT([disable_static])
>
> This ought to be disable-static. Dash, not underscore.
Will fix in v2.
J.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* [ulogd2 PATCH 11/13] build: quote and reformat some autoconf macro arguments
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (9 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 10/13] build: update obsolete autoconf macros Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 12/13] build: reformat autoconf AC_ARG_WITH, AC_ARG_ENABLE and related macros Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 13/13] build: bump autoconf version to 2.71 Jeremy Sowden
12 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 48 +++++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2dfeee6aa4cb..e69beb2b49ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_SUBST([libdl_LIBS])
dnl Checks for header files.
AC_HEADER_DIRENT
-AC_CHECK_HEADERS(fcntl.h unistd.h)
+AC_CHECK_HEADERS([fcntl.h unistd.h])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -32,7 +32,7 @@ AC_SYS_LARGEFILE
dnl Checks for library functions.
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(socket strerror)
+AC_CHECK_FUNCS([socket strerror])
AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""])
AC_SUBST([libpthread_LIBS])
@@ -155,27 +155,29 @@ AC_ARG_WITH([ulogd2libdir],
[ulogd2libdir="${libdir}/ulogd"])
AC_SUBST([ulogd2libdir])
-dnl AC_SUBST(DATABASE_DIR)
-dnl AC_SUBST(DATABASE_LIB)
-dnl AC_SUBST(DATABASE_LIB_DIR)
-dnl AC_SUBST(DB_DEF)
-dnl AC_SUBST(EXTRA_MYSQL_DEF)
-dnl AC_SUBST(EXTRA_PGSQL_DEF)
-
-dnl AC_SUBST(DATABASE_DRIVERS)
-
-dnl AM_CONDITIONAL(HAVE_MYSQL, test x$mysqldir != x)
-dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
-
-AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
- include/linux/Makefile include/linux/netfilter/Makefile \
- include/linux/netfilter_ipv4/Makefile libipulog/Makefile \
- input/Makefile input/packet/Makefile input/flow/Makefile \
- input/sum/Makefile \
- filter/Makefile filter/raw2packet/Makefile \
- output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \
- output/dbi/Makefile output/ipfix/Makefile \
- src/Makefile Makefile)
+AC_CONFIG_FILES([include/Makefile
+ include/ulogd/Makefile
+ include/libipulog/Makefile
+ include/linux/Makefile
+ include/linux/netfilter/Makefile
+ include/linux/netfilter_ipv4/Makefile
+ libipulog/Makefile
+ input/Makefile
+ input/packet/Makefile
+ input/flow/Makefile
+ input/sum/Makefile
+ filter/Makefile
+ filter/raw2packet/Makefile
+ output/Makefile
+ output/pcap/Makefile
+ output/mysql/Makefile
+ output/pgsql/Makefile
+ output/sqlite3/Makefile
+ output/dbi/Makefile
+ output/ipfix/Makefile
+ src/Makefile
+ Makefile])
+
AC_OUTPUT
define([EXPAND_VARIABLE],
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 12/13] build: reformat autoconf AC_ARG_WITH, AC_ARG_ENABLE and related macros
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (10 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 11/13] build: quote and reformat some autoconf macro arguments Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 16:01 ` [ulogd2 PATCH 13/13] build: bump autoconf version to 2.71 Jeremy Sowden
12 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 169 +++++++++++++++++++++------------------------------
1 file changed, 68 insertions(+), 101 deletions(-)
diff --git a/configure.ac b/configure.ac
index e69beb2b49ce..ea245dae3796 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,122 +37,89 @@ AC_CHECK_FUNCS([socket strerror])
AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""])
AC_SUBST([libpthread_LIBS])
-AC_ARG_ENABLE(ulog,
- AS_HELP_STRING([--enable-ulog], [Enable ulog module [default=yes]]),[enable_ulog=$enableval],[enable_ulog=yes])
+AC_ARG_ENABLE([ulog],
+ [AS_HELP_STRING([--enable-ulog], [Enable ulog module [default=yes]])],
+ [enable_ulog=$enableval],
+ [enable_ulog=yes])
AM_CONDITIONAL([BUILD_ULOG], [test "x$enable_ulog" = "xyes"])
-if [! test "x$enable_ulog" = "xyes"]; then
- enable_ulog="no"
-fi
+AS_IF([test "x$enable_ulog" != "xyes"], [enable_ulog=no])
dnl Check for the right nfnetlink version
PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
-AC_ARG_ENABLE(nflog,
- AS_HELP_STRING([--enable-nflog], [Enable nflog module [default=yes]]),[enable_nflog=$enableval],[enable_nflog=yes])
-AS_IF([test "x$enable_nflog" = "xyes"], [
- PKG_CHECK_MODULES([LIBNETFILTER_LOG], [libnetfilter_log >= 1.0.0])
- AC_DEFINE([BUILD_NFLOG], [1], [Building nflog module])
-])
-AM_CONDITIONAL([BUILD_NFLOG], [test "x$enable_nflog" = "xyes"])
-if [! test "x$enable_nflog" = "xyes"]; then
- enable_nflog="no"
-fi
-AC_ARG_ENABLE(nfct,
- AS_HELP_STRING([--enable-nfct], [Enable nfct module [default=yes]]),[enable_nfct=$enableval],[enable_nfct=yes])
-AS_IF([test "x$enable_nfct" = "xyes"], [
- PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2])
- AC_DEFINE([BUILD_NFCT], [1], [Building nfct module])
-])
+AC_ARG_ENABLE([nflog],
+ [AS_HELP_STRING([--enable-nflog], [Enable nflog module [default=yes]])],
+ [enable_nflog=$enableval],
+ [enable_nflog=yes])
+AM_CONDITIONAL([BUILD_NFLOG], [test "x$enable_nflog" = "xyes"])
+AS_IF([test "x$enable_nflog" = "xyes"],
+ [PKG_CHECK_MODULES([LIBNETFILTER_LOG], [libnetfilter_log >= 1.0.0])
+ AC_DEFINE([BUILD_NFLOG], [1], [Building nflog module])],
+ [enable_nflog=no])
+
+AC_ARG_ENABLE([nfct],
+ [AS_HELP_STRING([--enable-nfct],[Enable nfct module [default=yes]])],
+ [enable_nfct=$enableval],
+ [enable_nfct=yes])
AM_CONDITIONAL([BUILD_NFCT], [test "x$enable_nfct" = "xyes"])
-if [! test "x$enable_nfct" = "xyes"]; then
- enable_nfct="no"
-fi
-
-AC_ARG_ENABLE(nfacct,
- AS_HELP_STRING([--enable-nfacct], [Enable nfacct module [default=yes]]),[enable_nfacct=$enableval],[enable_nfacct=yes])
-AS_IF([test "x$enable_nfacct" = "xyes"], [
- PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
- PKG_CHECK_MODULES([LIBNETFILTER_ACCT], [libnetfilter_acct >= 1.0.1])
- AC_DEFINE([BUILD_NFACCT], [1], [Building nfacct module])
-])
+AS_IF([test "x$enable_nfct" = "xyes"],
+ [PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2])
+ AC_DEFINE([BUILD_NFCT], [1], [Building nfct module])],
+ [enable_nfct=no])
+
+AC_ARG_ENABLE([nfacct],
+ [AS_HELP_STRING([--enable-nfacct], [Enable nfacct module [default=yes]])],
+ [enable_nfacct=$enableval],
+ [enable_nfacct=yes])
AM_CONDITIONAL([BUILD_NFACCT], [test "x$enable_nfacct" = "xyes"])
-if [! test "x$enable_nfacct" = "xyes"]; then
- enable_nfacct="no"
-fi
-
-AC_ARG_WITH([pgsql], AS_HELP_STRING([--without-pgsql], [Build without postgresql output plugin [default=test]]))
-AS_IF([test "x$with_pgsql" != "xno"], [
- CT_CHECK_POSTGRES_DB()
-])
-AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x")
-if test "x$PQLIBPATH" != "x"; then
- enable_pgsql="yes"
-else
- enable_pgsql="no"
-fi
-
-AC_ARG_WITH([mysql], AS_HELP_STRING([--without-mysql], [Build without mysql output plugin [default=test]]))
-AS_IF([test "x$with_mysql" != "xno"], [
- CT_CHECK_MYSQL_DB()
-])
+AS_IF([test "x$enable_nfacct" = "xyes"],
+ [PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
+ PKG_CHECK_MODULES([LIBNETFILTER_ACCT], [libnetfilter_acct >= 1.0.1])
+ AC_DEFINE([BUILD_NFACCT], [1], [Building nfacct module])],
+ [enable_nfacct=no])
+
+AC_ARG_WITH([pgsql], [AS_HELP_STRING([--without-pgsql], [Build without postgresql output plugin [default=test]])])
+AS_IF([test "x$with_pgsql" != "xno"],
+ [CT_CHECK_POSTGRES_DB()])
+AM_CONDITIONAL([HAVE_PGSQL], [test "x$PQLIBPATH" != "x"])
+AS_IF([test "x$PQLIBPATH" != "x"], [enable_pgsql=yes], [enable_pgsql=no])
+
+AC_ARG_WITH([mysql], [AS_HELP_STRING([--without-mysql], [Build without mysql output plugin [default=test]])])
+AS_IF([test "x$with_mysql" != "xno"],
+ [CT_CHECK_MYSQL_DB()])
AM_CONDITIONAL(HAVE_MYSQL, test "x$MYSQL_LIB" != "x")
-if test "x$MYSQL_LIB" != "x"; then
- enable_mysql="yes"
-else
- enable_mysql="no"
-fi
-
+AS_IF([test "x$MYSQL_LIB" != "x"], [enable_mysql=yes], [enable_mysql=no])
-AC_ARG_WITH([sqlite], AS_HELP_STRING([--without-sqlite], [Build without SQLITE3 output plugin [default=test]]))
-AS_IF([test "x$with_sqlite" != "xno"], [
- PKG_CHECK_MODULES([libsqlite3], [sqlite3], [], [:])
-])
-AM_CONDITIONAL([HAVE_SQLITE3], [test -n "$libsqlite3_LIBS"])
-if test "x$libsqlite3_LIBS" != "x"; then
- enable_sqlite3="yes"
-else
- enable_sqlite3="no"
-fi
+AC_ARG_WITH([sqlite], [AS_HELP_STRING([--without-sqlite], [Build without SQLITE3 output plugin [default=test]])])
+AS_IF([test "x$with_sqlite" != "xno"],
+ [PKG_CHECK_MODULES([libsqlite3], [sqlite3], [], [:])])
+AM_CONDITIONAL([HAVE_SQLITE3], [test "x$libsqlite3_LIBS" != "x"])
+AS_IF([test "x$libsqlite3_LIBS" != "x"], [enable_sqlite3=yes], [enable_sqlite3=no])
-AC_ARG_WITH([dbi], AS_HELP_STRING([--without-dbi], [Build without DBI output plugin [default=test]]))
-AS_IF([test "x$with_dbi" != "xno"], [
- CT_CHECK_DBI()
-])
+AC_ARG_WITH([dbi], [AS_HELP_STRING([--without-dbi], [Build without DBI output plugin [default=test]])])
+AS_IF([test "x$with_dbi" != "xno"],
+ [CT_CHECK_DBI()])
AM_CONDITIONAL(HAVE_DBI, test "x$DBI_LIB" != "x")
-if test "x$DBI_LIB" != "x"; then
- enable_dbi="yes"
-else
- enable_dbi="no"
-fi
+AS_IF([test "x$DBI_LIB" != "x"], [enable_dbi=yes], [enable_dbi=no])
-AC_ARG_WITH([pcap], AS_HELP_STRING([--without-pcap], [Build without PCAP output plugin [default=test]]))
-AS_IF([test "x$with_pcap" != "xno"], [
- AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
- AC_SUBST([libpcap_LIBS])
-])
-AM_CONDITIONAL([HAVE_PCAP], [test -n "$libpcap_LIBS"])
-if test "x$libpcap_LIBS" != "x"; then
- enable_pcap="yes"
-else
- enable_pcap="no"
-fi
+AC_ARG_WITH([pcap], [AS_HELP_STRING([--without-pcap], [Build without PCAP output plugin [default=test]])])
+AS_IF([test "x$with_pcap" != "xno"],
+ [AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
+ AC_SUBST([libpcap_LIBS])])
+AM_CONDITIONAL([HAVE_PCAP], [test "x$libpcap_LIBS" != "x"])
+AS_IF([test "x$libpcap_LIBS" != "x"], [enable_pcap=yes], [enable_pcap=no])
-AC_ARG_WITH([jansson], AS_HELP_STRING([--without-jansson], [Build without JSON output plugin [default=test]]))
-AS_IF([test "x$with_jansson" != "xno"], [
- PKG_CHECK_MODULES([libjansson], [jansson], [], [:])
-])
-AM_CONDITIONAL([HAVE_JANSSON], [test -n "$libjansson_LIBS"])
-if test "x$libjansson_LIBS" != "x"; then
- enable_jansson="yes"
-else
- enable_jansson="no"
-fi
+AC_ARG_WITH([jansson], [AS_HELP_STRING([--without-jansson], [Build without JSON output plugin [default=test]])])
+AS_IF([test "x$with_jansson" != "xno"],
+ [PKG_CHECK_MODULES([libjansson], [jansson], [], [:])])
+AM_CONDITIONAL([HAVE_JANSSON], [test "x$libjansson_LIBS" != "x"])
+AS_IF([test "x$libjansson_LIBS" != "x"], [enable_jansson=yes], [enable_jansson=no])
AC_ARG_WITH([ulogd2libdir],
- AS_HELP_STRING([--with-ulogd2libdir=PATH],
- [Default directory to load ulogd2 plugin from [[LIBDIR/ulogd]]]),
- [ulogd2libdir="$withval"],
- [ulogd2libdir="${libdir}/ulogd"])
+ [AS_HELP_STRING([--with-ulogd2libdir=PATH],
+ [Default directory to load ulogd2 plugin from [[LIBDIR/ulogd]]])],
+ [ulogd2libdir="$withval"],
+ [ulogd2libdir="${libdir}/ulogd"])
AC_SUBST([ulogd2libdir])
AC_CONFIG_FILES([include/Makefile
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [ulogd2 PATCH 13/13] build: bump autoconf version to 2.71
2021-10-30 16:01 [ulogd2 PATCH 00/13] Build Improvements Jeremy Sowden
` (11 preceding siblings ...)
2021-10-30 16:01 ` [ulogd2 PATCH 12/13] build: reformat autoconf AC_ARG_WITH, AC_ARG_ENABLE and related macros Jeremy Sowden
@ 2021-10-30 16:01 ` Jeremy Sowden
2021-10-30 17:21 ` Jan Engelhardt
12 siblings, 1 reply; 22+ messages in thread
From: Jeremy Sowden @ 2021-10-30 16:01 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index ea245dae3796..8d18cc6eb7fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT([ulogd], [2.0.7])
-AC_PREREQ([2.50])
+AC_PREREQ([2.71])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b subdir-objects])
AC_CONFIG_HEADERS([config.h])
--
2.33.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [ulogd2 PATCH 13/13] build: bump autoconf version to 2.71
2021-10-30 16:01 ` [ulogd2 PATCH 13/13] build: bump autoconf version to 2.71 Jeremy Sowden
@ 2021-10-30 17:21 ` Jan Engelhardt
2021-11-06 11:07 ` Jeremy Sowden
0 siblings, 1 reply; 22+ messages in thread
From: Jan Engelhardt @ 2021-10-30 17:21 UTC (permalink / raw)
To: Jeremy Sowden; +Cc: Netfilter Devel
On Saturday 2021-10-30 18:01, Jeremy Sowden wrote:
>diff --git a/configure.ac b/configure.ac
>index ea245dae3796..8d18cc6eb7fb 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1,6 +1,6 @@
> dnl Process this file with autoconf to produce a configure script.
> AC_INIT([ulogd], [2.0.7])
>-AC_PREREQ([2.50])
>+AC_PREREQ([2.71])
> AC_CONFIG_AUX_DIR([build-aux])
> AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b subdir-objects])
> AC_CONFIG_HEADERS([config.h])
That's not a good move; it puts unnecessary stones on the road to
building from git (i.e. with full autoreconf) on e.g. SUSE 15.X (and some
other distros I am sure) that only have autoconf 2.69 or .65 or whatever.
Unless there is a _specific new shiny m4 macro_ that is invoked somewhere,
I cannot see a reason to gratuitiously bump PREREQ.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [ulogd2 PATCH 13/13] build: bump autoconf version to 2.71
2021-10-30 17:21 ` Jan Engelhardt
@ 2021-11-06 11:07 ` Jeremy Sowden
0 siblings, 0 replies; 22+ messages in thread
From: Jeremy Sowden @ 2021-11-06 11:07 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Netfilter Devel
[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]
On 2021-10-30, at 19:21:07 +0200, Jan Engelhardt wrote:
> On Saturday 2021-10-30 18:01, Jeremy Sowden wrote:
>
> >diff --git a/configure.ac b/configure.ac
> >index ea245dae3796..8d18cc6eb7fb 100644
> >--- a/configure.ac
> >+++ b/configure.ac
> >@@ -1,6 +1,6 @@
> > dnl Process this file with autoconf to produce a configure script.
> > AC_INIT([ulogd], [2.0.7])
> >-AC_PREREQ([2.50])
> >+AC_PREREQ([2.71])
> > AC_CONFIG_AUX_DIR([build-aux])
> > AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2
> 1.10b subdir-objects])
> > AC_CONFIG_HEADERS([config.h])
>
> That's not a good move; it puts unnecessary stones on the road to
> building from git (i.e. with full autoreconf) on e.g. SUSE 15.X (and
> some other distros I am sure) that only have autoconf 2.69 or .65 or
> whatever.
Did wonder if bumping to 2.71 might be a bit aggressive. :)
> Unless there is a _specific new shiny m4 macro_ that is invoked
> somewhere, I cannot see a reason to gratuitiously bump PREREQ.
Fair enough. Don't seem to be any signficant differences in the
generated files. Will drop this in v2.
J.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread