diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
4 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +version 0.9.6 (yet unreleased) +------------------------------ + +o fix compilation problem due to missing headers (Krisztian Kovacs) + version 0.9.5 (2007/07/29) ------------------------------ diff --git a/Makefile.am b/Makefile.am index 17282b2..239eedf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ EXTRA_DIST = $(man_MANS) Make_global.am ChangeLog TODO examples SUBDIRS = extensions src DIST_SUBDIRS = include src extensions -LINKOPTS = -lnfnetlink -lnetfilter_conntrack -lpthread +LIBS = @LIBNETFILTER_CONNTRACK_LIBS@ AM_CFLAGS = -g $(OBJECTS): libtool diff --git a/configure.in b/configure.in index 7e1cd20..6582b1b 100644 --- a/configure.in +++ b/configure.in @@ -104,4 +104,8 @@ dnl debug/src/Makefile dnl extensions/Makefile dnl src/Makefile]) +CFLAGS="$CFLAGS $LIBNETFILTER_CONNTRACK_CFLAGS" + +AC_SUBST(LIBNETFILTER_CONNTRACK_LIBS) + AC_OUTPUT(Makefile src/Makefile include/Makefile extensions/Makefile) diff --git a/src/Makefile.am b/src/Makefile.am index d71e23c..83511fa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,6 +8,7 @@ sbin_PROGRAMS = conntrack conntrackd conntrack_SOURCES = conntrack.c conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_icmp.la +conntrack_LDFLAGS = $(all_libraries) @LIBNETFILTER_CONNTRACK_LIBS@ conntrackd_SOURCES = alarm.c main.c run.c hash.c buffer.c \ local.c log.c mcast.c netlink.c \ @@ -22,6 +23,6 @@ conntrackd_SOURCES = alarm.c main.c run.c hash.c buffer.c \ build.c parse.c \ read_config_yy.y read_config_lex.l -conntrackd_LDFLAGS = $(all_libraries) -lnfnetlink -lnetfilter_conntrack +conntrackd_LDFLAGS = $(all_libraries) @LIBNETFILTER_CONNTRACK_LIBS@ EXTRA_DIST = read_config_yy.h |