[netfilter-cvslog] r6999 - in trunk/conntrack-tools: . src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-08-06 11:43:06 +0200 (Mon, 06 Aug 2007)
New Revision: 6999

Modified:
   trunk/conntrack-tools/ChangeLog
   trunk/conntrack-tools/Makefile.am
   trunk/conntrack-tools/configure.in
   trunk/conntrack-tools/src/Makefile.am
Log:
conntrack-tools compilation problem (K.Kovacs)


Modified: trunk/conntrack-tools/ChangeLog
===================================================================
--- trunk/conntrack-tools/ChangeLog	2007-08-04 08:28:23 UTC (rev 6998)
+++ trunk/conntrack-tools/ChangeLog	2007-08-06 09:43:06 UTC (rev 6999)
@@ -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)
 ------------------------------
 

Modified: trunk/conntrack-tools/Makefile.am
===================================================================
--- trunk/conntrack-tools/Makefile.am	2007-08-04 08:28:23 UTC (rev 6998)
+++ trunk/conntrack-tools/Makefile.am	2007-08-06 09:43:06 UTC (rev 6999)
@@ -9,7 +9,7 @@
 
 SUBDIRS   = extensions src
 DIST_SUBDIRS = include src extensions
-LINKOPTS  = -lnfnetlink -lnetfilter_conntrack -lpthread
+LIBS = @LIBNETFILTER_CONNTRACK_LIBS@
 AM_CFLAGS = -g
 
 $(OBJECTS): libtool

Modified: trunk/conntrack-tools/configure.in
===================================================================
--- trunk/conntrack-tools/configure.in	2007-08-04 08:28:23 UTC (rev 6998)
+++ trunk/conntrack-tools/configure.in	2007-08-06 09:43:06 UTC (rev 6999)
@@ -104,4 +104,8 @@
 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)

Modified: trunk/conntrack-tools/src/Makefile.am
===================================================================
--- trunk/conntrack-tools/src/Makefile.am	2007-08-04 08:28:23 UTC (rev 6998)
+++ trunk/conntrack-tools/src/Makefile.am	2007-08-06 09:43:06 UTC (rev 6999)
@@ -8,6 +8,7 @@
 
 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 @@
 		    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