[netfilter-cvslog] r6656 - in trunk/libnetfilter_cthelper: . include src

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2006-08-03 12:36:32 +0200 (Thu, 03 Aug 2006)
New Revision: 6656

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


Modified: trunk/libnetfilter_cthelper/configure.in
===================================================================
--- trunk/libnetfilter_cthelper/configure.in	2006-08-03 10:36:03 UTC (rev 6655)
+++ trunk/libnetfilter_cthelper/configure.in	2006-08-03 10:36:32 UTC (rev 6656)
@@ -18,15 +18,23 @@
 *) 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
+LIBNFCONNTRACK_REQUIRED=0.0.31
+LIBNFQUEUE_REQUIRED=0.0.12
+ 
+PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,,
+	AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED))
+PKG_CHECK_MODULES(LIBNFCONNTRACK, libnetfilter_conntrack >= $LIBNFCONNTRACK_REQUIRED,,
+	AC_MSG_ERROR(Cannot find libnetfilter_conntrack >= $LIBNFCONNTRACK_REQUIRED))
+PKG_CHECK_MODULES(LIBNFQUEUE, libnetfilter_queue >= $LIBNFQUEUE_REQUIRED,,
+	AC_MSG_ERROR(Cannot find libnetfilter_queue >= $LIBNFQUEUE_REQUIRED))
 
-AC_CHECK_LIB(netfilter_conntrack, nfct_open_nfnl, AC_MSG_RESULT(found), AC_MSG_ERROR([libnetfilter_conntrack 0.0.31 or later needed]))
-AC_CHECK_HEADER([libnetfilter_conntrack/libnetfilter_conntrack.h], [AC_MSG_RESULT([found])], [AC_MSG_ERROR([libnetfilter_conntrack 0.0.31 or later needed])])
+CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS $LIBNFCONNTRACK_CFLAGS $LIBNFQUEUE_CFLAGS"
+LIBNFCTHELPER_LIBS="$LIBNFNETLINK_LIBS $LIBNFCONNTRACK_LIBS $LIBNFQUEUE_LIBS"
 
-AC_CHECK_LIB(netfilter_queue, nfq_open_nfnl, AC_MSG_RESULT(found), AC_MSG_ERROR([libnetfilter_queue 0.0.12 or later needed]))
-AC_CHECK_HEADER([libnetfilter_queue/libnetfilter_queue.h], [AC_MSG_RESULT([found])], [AC_MSG_ERROR([libnetfilter_queue 0.0.12 or later needed])])
+dnl Output the makefile
+AC_SUBST(LIBNFCTHELPER_LIBS)
 
-dnl Output the makefile
 AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile include/libnetfilter_cthelper/Makefile libnetfilter_cthelper.pc)
 

Modified: trunk/libnetfilter_cthelper/include/Makefile.am
===================================================================
--- trunk/libnetfilter_cthelper/include/Makefile.am	2006-08-03 10:36:03 UTC (rev 6655)
+++ trunk/libnetfilter_cthelper/include/Makefile.am	2006-08-03 10:36:32 UTC (rev 6656)
@@ -1,4 +1,4 @@
 
 SUBDIRS = libnetfilter_cthelper
 
-nodist_HEADERS = linux_list.h
+# nodist_HEADERS = linux_list.h

Modified: trunk/libnetfilter_cthelper/src/Makefile.am
===================================================================
--- trunk/libnetfilter_cthelper/src/Makefile.am	2006-08-03 10:36:03 UTC (rev 6655)
+++ trunk/libnetfilter_cthelper/src/Makefile.am	2006-08-03 10:36:32 UTC (rev 6656)
@@ -3,8 +3,8 @@
 LIBVERSION=0:0:0
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
-AM_CFLAGS=-fPIC -Wall
-LIBS=
+AM_CFLAGS = -fPIC -Wall
+LIBS = @LIBNFCTHELPER_LIBS@
 
 lib_LTLIBRARIES = libnetfilter_cthelper.la