diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | extensions/Makefile.am | 16 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | src/conntrack.c | 4 |
4 files changed, 14 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 088a5f8..228f365 100644 --- a/configure.in +++ b/configure.in @@ -75,7 +75,7 @@ AC_ARG_WITH(kernel, NF_KERNEL_SOURCE($with_kernel),NF_KERNEL_SOURCE()) if test ! -z "$libdir"; then - MODULE_DIR="\\\"$libdir/\\\"" + MODULE_DIR="\\\"$libdir/conntrack/\\\"" CFLAGS="$CFLAGS -DCONNTRACK_LIB_DIR=$MODULE_DIR" fi diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 1cae1df..5149336 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -4,10 +4,14 @@ INCLUDES=-I../include -I${KERNELDIR} CFLAGS=-fPIC -Wall LIBS= -lib_LTLIBRARIES = libct_proto_tcp.la libct_proto_udp.la libct_proto_icmp.la \ - libct_proto_sctp.la +pkglib_LTLIBRARIES = ct_proto_tcp.la ct_proto_udp.la \ + ct_proto_icmp.la ct_proto_sctp.la -libct_proto_tcp_la_SOURCES = libct_proto_tcp.c -libct_proto_udp_la_SOURCES = libct_proto_udp.c -libct_proto_icmp_la_SOURCES = libct_proto_icmp.c -libct_proto_sctp_la_SOURCES = libct_proto_sctp.c +ct_proto_tcp_la_SOURCES = libct_proto_tcp.c +ct_proto_tcp_la_LDFLAGS = -module +ct_proto_udp_la_SOURCES = libct_proto_udp.c +ct_proto_udp_la_LDFLAGS = -module +ct_proto_icmp_la_SOURCES = libct_proto_icmp.c +ct_proto_icmp_la_LDFLAGS = -module +ct_proto_sctp_la_SOURCES = libct_proto_sctp.c +ct_proto_sctp_la_LDFLAGS = -module diff --git a/include/Makefile.am b/include/Makefile.am index f91ed48..832da6d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,2 +1,2 @@ -include_HEADERS = libct_proto.h linux_list.h +pkginclude_HEADERS = conntrack.h linux_list.h diff --git a/src/conntrack.c b/src/conntrack.c index e2fcc16..59b95a4 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -166,9 +166,9 @@ static struct ctproto_handler *findproto(char *name) } if (!handler) { - char path[sizeof("libct_proto_.so") + char path[sizeof("ct_proto_.so") + strlen(name) + strlen(lib_dir)]; - sprintf(path, "%s/libct_proto_%s.so", lib_dir, name); + sprintf(path, "%s/ct_proto_%s.so", lib_dir, name); if (dlopen(path, RTLD_NOW)) handler = findproto(name); else |