build: use appropriate location for program modules

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

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/Makefile.am b/Makefile.am
index d4c180b69c5e786f975951240120b9a845c987d3..35e033835771edd604bdeedb63bef3bdc6acd477 100644 (file)
--- 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 1b799feb134f2824c55f80365f5272435cee5402..8a92824d32bbfcbb5f3498c5360e239fb448252c 100644 (file)
--- 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 3c3f152a39c2453452253c0309be70795cde8eae..83a0e52c78f134c3c459b490e94a6c79f0a1c4a5 100644 (file)
--- 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 8b5a4ad2231d843ee916cd18251cfdd0c0884944..a39f3aeeaeabe2c7481df73a0e2565930fb8c25d 100644 (file)
--- 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 127caf6ba2e1b281609bfae823ce0c82ba04b17a..eaa16441814be3984342e76dc7d6d055bf953dc1 100644 (file)
--- 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 2e972f8a56cb1b0047c0d81b32077a178708812f..d4ca449492998febd977fae335dfabe740d3f18f 100644 (file)
--- 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 9d9ac73447868a496af10ff01e6bcf5a6b48d9b1..3811dad20afe11584f55ff66b9b9eb2876b6608e 100644 (file)
--- 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 f413cab4a3405398d8386f5f895bc004bc05d8c6..ca05e00b249df8fc562395c9e517c45414c09cf2 100644 (file)
--- 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 c24208c3e3026ae96e75226c02a2ad1cfe014866..5c3afbb6ccab2aa014c131cfd5aba301ebffae18 100644 (file)
--- 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 47580d2d899ced74ef7f0ffb5a091c39a3886035..54c6da3906bc68d886b4d5972081d2676bc68c09 100644 (file)
--- 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 bdaf1d249dce04f2e16919b9170e79cc556b60dc..32b3ea2392472ab30e0036740afe4403dda5b12a 100644 (file)
--- 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 3bfec2eda14c70a9c883b4984e3870e27a24d355..507dbfc9d365ad7a4efa7931791f379389caee42 100644 (file)
--- 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 634e37f2ecce9207c51800f33a9ab4778ac3584b..268818f81820fbe684169dfac1d0e1555af77f17 100644 (file)
--- 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