projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7' into collectd-5.8
[collectd.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
f39096e
..
d93b51b
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2380,13
+2380,30
@@
if test "x$with_libdpdk" != "xno"; then
fi
if test "x$with_libdpdk" = "xyes"; then
fi
if test "x$with_libdpdk" = "xyes"; then
+ SAVE_LIBS="$LIBS"
+ LIBS="$LIBDPDK_LIBS $LIBS"
SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$LIBDPDK_LDFLAGS $LDFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$LIBDPDK_LDFLAGS $LDFLAGS"
- AC_CHECK_LIB([dpdk], [rte_eal_init],
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS"
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$LIBDPDK_CFLAGS $CFLAGS"
+ AC_LINK_IFELSE(
+ [
+ AC_LANG_PROGRAM(
+ [[
+ #include <rte_eal.h>
+ ]],
+ [[return rte_eal_init(0, NULL);]]
+ )
+ ],
[with_libdpdk="yes"],
[with_libdpdk="no (symbol 'rte_eal_init' not found)"]
)
[with_libdpdk="yes"],
[with_libdpdk="no (symbol 'rte_eal_init' not found)"]
)
+ LIBS="$SAVE_LIBS"
LDFLAGS="$SAVE_LDFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ CFLAGS="$SAVE_CFLAGS"
fi
# }}}
fi
# }}}
@@
-3418,10
+3435,12
@@
fi
if test "x$with_libmongoc" = "xyes"; then
BUILD_WITH_LIBMONGOC_CFLAGS="$LIBMONGOC_CFLAGS"
BUILD_WITH_LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS"
if test "x$with_libmongoc" = "xyes"; then
BUILD_WITH_LIBMONGOC_CFLAGS="$LIBMONGOC_CFLAGS"
BUILD_WITH_LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS"
+ BUILD_WITH_LIBMONGOC_LIBS="$LIBMONGOC_LIBS"
fi
AC_SUBST([BUILD_WITH_LIBMONGOC_CFLAGS])
AC_SUBST([BUILD_WITH_LIBMONGOC_LDFLAGS])
fi
AC_SUBST([BUILD_WITH_LIBMONGOC_CFLAGS])
AC_SUBST([BUILD_WITH_LIBMONGOC_LDFLAGS])
+AC_SUBST([BUILD_WITH_LIBMONGOC_LIBS])
# }}}
# --with-libmosquitto {{{
# }}}
# --with-libmosquitto {{{