[netfilter-cvslog] r6655 - in trunk/libnetfilter_queue: . src

[kaber at netfilter.org]

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

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


Modified: trunk/libnetfilter_queue/configure.in
===================================================================
--- trunk/libnetfilter_queue/configure.in	2006-08-03 10:35:28 UTC (rev 6654)
+++ trunk/libnetfilter_queue/configure.in	2006-08-03 10:36:03 UTC (rev 6655)
@@ -17,8 +17,16 @@
 *) 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))
+ 
+CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS"
+LIBNFQUEUE_LIBS="$LIBNFNETLINK_LIBS"
+ 
+AC_SUBST(LIBNFQUEUE_LIBS)
 
 dnl Output the makefiles
 AC_OUTPUT(Makefile include/Makefile include/libnetfilter_queue/Makefile src/Makefile utils/Makefile libnetfilter_queue.pc)

Modified: trunk/libnetfilter_queue/src/Makefile.am
===================================================================
--- trunk/libnetfilter_queue/src/Makefile.am	2006-08-03 10:35:28 UTC (rev 6654)
+++ trunk/libnetfilter_queue/src/Makefile.am	2006-08-03 10:36:03 UTC (rev 6655)
@@ -3,8 +3,8 @@
 LIBVERSION=2:0:1
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
-AM_CFLAGS=-fPIC -Wall
-LIBS=
+AM_CFLAGS = -fPIC -Wall
+LIBS = @LIBNFQUEUE_LIBS@
 
 lib_LTLIBRARIES = libnetfilter_queue.la libnetfilter_queue_libipq.la