From 4f935079509e3b2058ef6b9fedc7e64278a08a5e Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org" Date: Fri, 23 Sep 2005 19:19:03 +0000 Subject: fix include paths, use correct automake version, add missing Makefile.am --- _conntrack/autogen.sh | 4 ++-- _conntrack/configure.in | 2 +- _conntrack/include/Makefile.am | 2 ++ _conntrack/src/libnfnetlink_conntrack.c | 2 +- _conntrack/utils/Makefile.am | 10 +++++----- _conntrack/utils/ctnl_test.c | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 _conntrack/include/Makefile.am diff --git a/_conntrack/autogen.sh b/_conntrack/autogen.sh index f6cdc76..b3a2762 100755 --- a/_conntrack/autogen.sh +++ b/_conntrack/autogen.sh @@ -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/_conntrack/configure.in b/_conntrack/configure.in index 1516c80..f14f620 100644 --- a/_conntrack/configure.in +++ b/_conntrack/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/_conntrack/include/Makefile.am b/_conntrack/include/Makefile.am new file mode 100644 index 0000000..2488ee2 --- /dev/null +++ b/_conntrack/include/Makefile.am @@ -0,0 +1,2 @@ + +nobase_include_HEADERS = libnfnetlink_conntrack/libnfnetlink_conntrack.h diff --git a/_conntrack/src/libnfnetlink_conntrack.c b/_conntrack/src/libnfnetlink_conntrack.c index 868cf96..e35ad3f 100644 --- a/_conntrack/src/libnfnetlink_conntrack.c +++ b/_conntrack/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/_conntrack/utils/Makefile.am b/_conntrack/utils/Makefile.am index f78bdbe..df6c556 100644 --- a/_conntrack/utils/Makefile.am +++ b/_conntrack/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/_conntrack/utils/ctnl_test.c b/_conntrack/utils/ctnl_test.c index 47c6a8d..20693d0 100644 --- a/_conntrack/utils/ctnl_test.c +++ b/_conntrack/utils/ctnl_test.c @@ -12,7 +12,7 @@ #include #include -#include "libctnetlink.h" +#include static struct ctnl_handle *cth; -- cgit v1.2.3