diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | extensions/Makefile.am | 15 | ||||
| -rw-r--r-- | src/libnetfilter_conntrack.c | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/configure.in b/configure.in index a2b8468..c7a6ec6 100644 --- a/configure.in +++ b/configure.in @@ -60,7 +60,7 @@ AC_ARG_WITH(kernel, NF_KERNEL_SOURCE($with_kernel),NF_KERNEL_SOURCE()) if test ! -z "$libdir"; then - MODULE_DIR="\\\"$libdir/\\\"" + MODULE_DIR="\\\"$libdir/libnetfilter_conntrack/\\\"" CFLAGS="$CFLAGS -DLIBNETFILTER_CONNTRACK_DIR=$MODULE_DIR" fi diff --git a/extensions/Makefile.am b/extensions/Makefile.am index c06e9f6..c2b0449 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -8,9 +8,14 @@ INCLUDES=-I../include -I${KERNELDIR} CFLAGS=-fPIC -Wall LIBS= -lib_LTLIBRARIES = libnetfilter_conntrack_tcp.la libnetfilter_conntrack_udp.la libnetfilter_conntrack_icmp.la libnetfilter_conntrack_sctp.la +pkglib_LTLIBRARIES = nfct_proto_tcp.la nfct_proto_udp.la \ + nfct_proto_icmp.la nfct_proto_sctp.la -libnetfilter_conntrack_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c -libnetfilter_conntrack_udp_la_SOURCES = libnetfilter_conntrack_udp.c -libnetfilter_conntrack_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c -libnetfilter_conntrack_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c +nfct_proto_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c +nfct_proto_tcp_la_LDFLAGS = -module +nfct_proto_udp_la_SOURCES = libnetfilter_conntrack_udp.c +nfct_proto_udp_la_LDFLAGS = -module +nfct_proto_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c +nfct_proto_icmp_la_LDFLAGS = -module +nfct_proto_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c +nfct_proto_sctp_la_LDFLAGS = -module diff --git a/src/libnetfilter_conntrack.c b/src/libnetfilter_conntrack.c index e8fa2b7..63e5719 100644 --- a/src/libnetfilter_conntrack.c +++ b/src/libnetfilter_conntrack.c @@ -297,9 +297,9 @@ static struct nfct_proto *findproto(char *name) } if (!handler) { - char path[sizeof("libnetfilter_conntrack_.so") + char path[sizeof("nfct_proto_.so") + strlen(name) + strlen(lib_dir)]; - sprintf(path, "%s/libnetfilter_conntrack_%s.so", lib_dir, name); + sprintf(path, "%s/nfct_proto_%s.so", lib_dir, name); if (dlopen(path, RTLD_NOW)) handler = findproto(name); else |