diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-10-31 00:01:41 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2010-10-31 00:01:41 +0200 |
| commit | 5ac3cb42bfd24d1122775b17ae2ff1ddc201d984 (patch) | |
| tree | 7d860f5f90bda6e881cb92526864b7780cc6e619 | |
| parent | 360d428b1d03b1a6ac5d73d15a1e169b0094ab28 (diff) | |
build: no need for error message in PKG_CHECK_MODULES
PKG_CHECK_MODULES already produces its own (and more verbose) messsage
when a module cannot be found.
Mucking around with CFLAGS and LIBS is also not needed since pkgconfig
takes care of providing variables, so let's use them in Makefile.am.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 7fa3566..4e1dd6b 100644 --- a/configure.ac +++ b/configure.ac @@ -20,15 +20,7 @@ case "$host" in esac dnl Dependencies -LIBNFNETLINK_REQUIRED=0.0.41 - -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) +PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41]) dnl Output the makefile AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc doxygen.cfg) diff --git a/src/Makefile.am b/src/Makefile.am index 5668473..e78faa8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,14 +21,14 @@ LIBVERSION=2:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS = -Wall -LIBS = @LIBNFLOG_LIBS@ +AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS} lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \ -version-info $(LIBVERSION) libnetfilter_log_la_SOURCES = libnetfilter_log.c +libnetfilter_log_la_LIBADD = ${LIBNFNETLINK_LIBS} libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles \ -version-info 1:0:0 |