[netfilter-cvslog] r6653 - in trunk/libnetfilter_conntrack: . src

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2006-08-03 12:35:00 +0200 (Thu, 03 Aug 2006)
New Revision: 6653

Modified:
   trunk/libnetfilter_conntrack/Makefile.am
   trunk/libnetfilter_conntrack/configure.in
   trunk/libnetfilter_conntrack/src/Makefile.am
Log:
[PATCH 1/6] libnetfilter_conntrack pkt-config modifications (KOVACS Krisztian <hidden at balabit.hu>)


Modified: trunk/libnetfilter_conntrack/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/Makefile.am	2006-07-26 14:03:11 UTC (rev 6652)
+++ trunk/libnetfilter_conntrack/Makefile.am	2006-08-03 10:35:00 UTC (rev 6653)
@@ -3,7 +3,6 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
 SUBDIRS	= include src l3extensions extensions utils
-LINKOPTS = -lnfnetlink
 
 man_MANS = #nfnetlink_conntrack.3 nfnetlink_conntrack.7
 

Modified: trunk/libnetfilter_conntrack/configure.in
===================================================================
--- trunk/libnetfilter_conntrack/configure.in	2006-07-26 14:03:11 UTC (rev 6652)
+++ trunk/libnetfilter_conntrack/configure.in	2006-08-03 10:35:00 UTC (rev 6653)
@@ -18,9 +18,12 @@
 *) AC_MSG_ERROR([Linux only, dude!]);;
 esac
 
-AC_CHECK_LIB(nfnetlink, nfnl_subsys_open, AC_MSG_RESULT(found), AC_MSG_ERROR([libnfnetlink 0.0.16 or later needed]))
-AC_CHECK_HEADER([libnfnetlink/linux_nfnetlink.h], [AC_MSG_RESULT([found])], [AC_MSG_ERROR([libnfnetlink 0.0.16 or later needed])])
+dnl Dependencies
+LIBNFNETLINK_REQUIRED=0.0.16
 
+PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,,
+	AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED))
+
 AC_CHECK_HEADERS(arpa/inet.h)
 dnl Check for inet_ntop
 AC_CHECK_FUNCS(inet_ntop)
@@ -61,7 +64,11 @@
 	CFLAGS="$CFLAGS -DLIBNETFILTER_CONNTRACK_DIR=$MODULE_DIR"
 fi
 
+CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS"
+LIBNFCONNTRACK_LIBS="$LIBNFNETLINK_LIBS"
 
+AC_SUBST(LIBNFCONNTRACK_LIBS)
+
 dnl Output the makefile
 AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile include/libnetfilter_conntrack/Makefile l3extensions/Makefile extensions/Makefile libnetfilter_conntrack.pc)
 

Modified: trunk/libnetfilter_conntrack/src/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/src/Makefile.am	2006-07-26 14:03:11 UTC (rev 6652)
+++ trunk/libnetfilter_conntrack/src/Makefile.am	2006-08-03 10:35:00 UTC (rev 6653)
@@ -4,8 +4,8 @@
 
 #EXTRA_DIST = $(man_MANS) acinclude.m4
 
-AM_CFLAGS=-fPIC -Wall
-LIBS=
+AM_CFLAGS = -fPIC -Wall
+LIBS = @LIBNFCONNTRACK_LIBS@
 
 lib_LTLIBRARIES = libnetfilter_conntrack.la