diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-10-31 00:44:12 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2010-10-31 00:46:35 +0200 |
| commit | 39db4adb8932166a2fcb1143f512d2e212e6de8b (patch) | |
| tree | b9d5e583ec67c558bc2ab13cfb5be0afd6e780cc /configure.ac | |
| parent | 6ef83f8c7ff52adaa6f50fc9017975a379f4c78e (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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index e068798..37fbeee 100644 --- a/configure.ac +++ b/configure.ac @@ -18,22 +18,8 @@ case "$host" in esac dnl Dependencies -LIBNFNETLINK_REQUIRED=1.0.0 -LIBNETFILTER_CONNTRACK_REQUIRED=0.0.102 - -AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) -if test "x$HAVE_PKG_CONFIG" = "x" -then - echo "*** Error: No suitable pkg-config found. ***" - echo " Please install the 'pkg-config' package." - exit 1 -fi - -PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,, - AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED)) - -PKG_CHECK_MODULES(LIBNETFILTER_CONNTRACK, libnetfilter_conntrack >= $LIBNETFILTER_CONNTRACK_REQUIRED,, - AC_MSG_ERROR(Cannot find libnetfilter_conntrack >= $LIBNETFILTER_CONNTRACK_REQUIRED)) +PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.0]) +PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 0.0.102]) AC_CHECK_PROGS(XYACC,$YACC bison yacc,none) if test "$XYACC" = "none" @@ -72,9 +58,6 @@ AC_CHECK_HEADERS([linux/capability.h],, [AC_MSG_ERROR([Cannot find linux/capabib dnl AC_CHECK_LIB([c], [main]) # FIXME: Replace `main' with a function in `-ldl': -AC_CHECK_LIB([nfnetlink], [nfnl_query] ,,,[-lnfnetlink]) -AC_CHECK_LIB([netfilter_conntrack], [nfct_query] ,,,[-lnetfilter_conntrack]) - AC_CHECK_HEADERS(arpa/inet.h) dnl check for inet_pton AC_CHECK_FUNCS(inet_pton) @@ -127,9 +110,5 @@ dnl debug/src/Makefile dnl extensions/Makefile dnl src/Makefile]) -CFLAGS="$CFLAGS $LIBNETFILTER_CONNTRACK_CFLAGS" - -AC_SUBST(LIBNETFILTER_CONNTRACK_LIBS) - AC_CONFIG_FILES([Makefile src/Makefile include/Makefile extensions/Makefile]) AC_OUTPUT |