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:28 +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:28 +0000 |
| commit | 6976bf8cb8dd1315778e0b353eb9f892590264d2 (patch) | |
| tree | 2c96caef01036147e747408243f4963facdb8ea1 | |
| parent | 1a57f5d372a0aae20f999589ce78a5e0cf7b6c2a (diff) | |
[PATCH 2/6] libnetfilter_log pkt-config changes (KOVACS Krisztian <hidden@balabit.hu>)
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/configure.in b/configure.in index e9d1e1b..11a1bb7 100644 --- a/configure.in +++ b/configure.in @@ -18,8 +18,16 @@ 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)) + +CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS" +LIBNFLOG_LIBS="$LIBNFNETLINK_LIBS" + +AC_SUBST(LIBNFLOG_LIBS) dnl Output the makefile AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc) diff --git a/src/Makefile.am b/src/Makefile.am index ba135b7..6e5183d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,8 +3,8 @@ LIBVERSION=2:0:1 INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-fPIC -Wall -LIBS= +AM_CFLAGS = -fPIC -Wall +LIBS = @LIBNFLOG_LIBS@ lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la |