diff options
| author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org> | 2006-08-03 10:35:00 +0000 |
|---|---|---|
| committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org> | 2006-08-03 10:35:00 +0000 |
| commit | d4ec13c2e403e9234aaf2a9472107e99763d09c9 (patch) | |
| tree | 22c1f0ff525aa9d7552df560d111ace86fd25d55 | |
| parent | da21de264b5f211036b554cdcb22fd1a9def0916 (diff) | |
[PATCH 1/6] libnetfilter_conntrack pkt-config modifications (KOVACS Krisztian <hidden@balabit.hu>)
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 7fc7169..62c85bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,6 @@ include $(top_srcdir)/Make_global.am AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 SUBDIRS = include src l3extensions extensions utils -LINKOPTS = -lnfnetlink man_MANS = #nfnetlink_conntrack.3 nfnetlink_conntrack.7 diff --git a/configure.in b/configure.in index afb2bed..3aafbf1 100644 --- a/configure.in +++ b/configure.in @@ -18,8 +18,11 @@ case $target in *) 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 @@ -61,6 +64,10 @@ if test ! -z "$libdir"; then 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) diff --git a/src/Makefile.am b/src/Makefile.am index e7ba465..8a1278b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,8 +4,8 @@ include $(top_srcdir)/Make_global.am #EXTRA_DIST = $(man_MANS) acinclude.m4 -AM_CFLAGS=-fPIC -Wall -LIBS= +AM_CFLAGS = -fPIC -Wall +LIBS = @LIBNFCONNTRACK_LIBS@ lib_LTLIBRARIES = libnetfilter_conntrack.la |