projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure.ac: fix indentation
[collectd.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
667e944
..
7514571
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2360,19
+2360,21
@@
AC_ARG_WITH([libdpdk],
)
if test "x$with_libdpdk" != "xno"; then
)
if test "x$with_libdpdk" != "xno"; then
- PKG_CHECK_MODULES([DPDK], [libdpdk])
+ PKG_CHECK_MODULES([DPDK], [libdpdk], [],
+ [AC_MSG_NOTICE([no DPDK pkg-config, using defaults])])
+ if test "x$LIBDPDK_CPPFLAGS" = "x"; then
+ LIBDPDK_CPPFLAGS="-I/usr/include/dpdk"
+ fi
if test "x$LIBDPDK_CFLAGS" = "x"; then
if test "x$LIBDPDK_CFLAGS" = "x"; then
- LIBDPDK_CFLAGS="$DPDK_CFLAGS"
+ LIBDPDK_CFLAGS="$DPDK_CFLAGS"
+ LIBDPDK_CPPFLAGS="$LIBDPDK_CPPFLAGS $DPDK_CFLAGS"
fi
if test "x$LIBDPDK_LIBS" = "x"; then
fi
if test "x$LIBDPDK_LIBS" = "x"; then
- if test "x$DPDK_LIBS" != "x"; then
- LIBDPDK_LIBS="$DPDK_LIBS"
- else
- LIBDPDK_LIBS="-ldpdk"
- fi
- fi
- if test "x$LIBDPDK_CPPFLAGS" = "x"; then
- LIBDPDK_CPPFLAGS="-I/usr/include/dpdk"
+ if test "x$DPDK_LIBS" != "x"; then
+ LIBDPDK_LIBS="$DPDK_LIBS"
+ else
+ LIBDPDK_LIBS="-ldpdk"
+ fi
fi
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS"
fi
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS"
@@
-6485,8
+6487,7
@@
if test "x$with_libxenctrl" = "xyes"; then
plugin_xencpu="yes"
fi
plugin_xencpu="yes"
fi
-if test "x$with_libdpdk" = "xyes"
-then
+if test "x$with_libdpdk" = "xyes"; then
plugin_dpdkevents="$dpdk_keepalive"
plugin_dpdkstat="yes"
fi
plugin_dpdkevents="$dpdk_keepalive"
plugin_dpdkstat="yes"
fi