summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-11-06 16:41:39 +0100
committerTobias Klauser <tklauser@distanz.ch>2015-11-06 16:41:39 +0100
commit8595f4e1f170152b4f4117a03ce64b59a3023985 (patch)
treef1af2e9af4f6b2197199809f1a3c8beb24079562
parente6556d7736ff65de5ebd8e984ab7b5615731ee29 (diff)
build: configure: Silence pkg-config check for libnetfilter_conntrack
Redirect stderr output of pkg-config to config.log in order to not spam the configure output with pkg-config errors. Instead, use the same pkg-config commands as for the other library checks to get libnetfilter_conntrack cflags. Additionally, use pkg-config to the the linker flags as well. Fixes: 19991f90 ("build: Handle libnetfilter-conntrack with pkg-config") Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rwxr-xr-xconfigure7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index edb10fd..5055654 100755
--- a/configure
+++ b/configure
@@ -378,7 +378,12 @@ int main(void)
}
EOF
- $CC -o $TMPDIR/nfcttest $TMPDIR/nfcttest.c $(pkg-config libnetfilter_conntrack --cflags) -lnetfilter_conntrack >> config.log 2>&1
+ $CC \
+ $($PKG_CONFIG --cflags libnetfilter_conntrack 2>> config.log) \
+ -o $TMPDIR/nfcttest \
+ $TMPDIR/nfcttest.c \
+ $($PKG_CONFIG --libs libnetfilter_conntrack 2>> config.log) \
+ >> config.log 2>&1
if [ ! -x $TMPDIR/nfcttest ] ; then
echo "[NO]"
MISSING_DEFS=1