diff options
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libnfnetlink_conntrack.c | 2 | ||||
| -rw-r--r-- | utils/Makefile.am | 10 | ||||
| -rw-r--r-- | utils/ctnl_test.c | 2 |
6 files changed, 12 insertions, 10 deletions
@@ -11,7 +11,7 @@ run () fi } -run aclocal +run aclocal-1.8 #run autoheader -run automake -a +run automake-1.8 -a run autoconf diff --git a/configure.in b/configure.in index 1516c80..f14f620 100644 --- a/configure.in +++ b/configure.in @@ -63,5 +63,5 @@ dnl-------------------------------- dnl Output the makefile -AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnfnetlink_conntrack/Makefile utils/Makefile) +AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile) diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 0000000..2488ee2 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,2 @@ + +nobase_include_HEADERS = libnfnetlink_conntrack/libnfnetlink_conntrack.h diff --git a/src/libnfnetlink_conntrack.c b/src/libnfnetlink_conntrack.c index 868cf96..e35ad3f 100644 --- a/src/libnfnetlink_conntrack.c +++ b/src/libnfnetlink_conntrack.c @@ -99,7 +99,7 @@ int ctnl_open(struct ctnl_handle *cth, u_int8_t subsys_id, memset(cth, 0, sizeof(*cth)); - err = nfnl_open(&cth->nfnlh, subsys_id, subscriptions); + err = nfnl_open(&cth->nfnlh, subsys_id, IPCTNL_MSG_MAX, subscriptions); if (err < 0) { return err; } diff --git a/utils/Makefile.am b/utils/Makefile.am index f78bdbe..df6c556 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,8 +1,8 @@ -bin_PROGRAMS = ctnl_test -ctnl_test_SOURCES = ctnl_test.c - - INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} -ctnl_test_LDFLAGS = $(all_libraries) -lnfnetlink_conntrack -lnfnetlink +bin_PROGRAMS = ctnl_test + +ctnl_test_SOURCES = ctnl_test.c +ctnl_test_LDADD = ../src/libnfnetlink_conntrack.la +ctnl_test_LDFLAGS = -dynamic diff --git a/utils/ctnl_test.c b/utils/ctnl_test.c index 47c6a8d..20693d0 100644 --- a/utils/ctnl_test.c +++ b/utils/ctnl_test.c @@ -12,7 +12,7 @@ #include <linux/netlink.h> #include <linux/netfilter/nfnetlink.h> -#include "libctnetlink.h" +#include <libnfnetlink_conntrack/libnfnetlink_conntrack.h> static struct ctnl_handle *cth; |