projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netapp plugin: Fix compilation problems.
[collectd.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
fedb26f
..
993e319
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2606,8
+2606,6
@@
fi
# }}}
# --with-libdpdk {{{
# }}}
# --with-libdpdk {{{
-LIBDPDK_CPPFLAGS="-I/usr/include/dpdk"
-LIBDPDK_LDFLAGS=""
AC_ARG_VAR([LIBDPDK_CPPFLAGS], [Preprocessor flags for libdpdk])
AC_ARG_VAR([LIBDPDK_LDFLAGS], [Linker flags for libdpdk])
AC_ARG_VAR([LIBDPDK_CPPFLAGS], [Preprocessor flags for libdpdk])
AC_ARG_VAR([LIBDPDK_LDFLAGS], [Linker flags for libdpdk])
@@
-2615,6
+2613,10
@@
AC_ARG_WITH([libdpdk], [AS_HELP_STRING([--without-libdpdk], [Disable libdpdk.])]
if test "x$with_libdpdk" != "xno"
then
if test "x$with_libdpdk" != "xno"
then
+ if test "x$LIBDPDK_CPPFLAGS" = "x"
+ then
+ LIBDPDK_CPPFLAGS="-I/usr/include/dpdk"
+ fi
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS"
AC_CHECK_HEADERS([rte_config.h],
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS"
AC_CHECK_HEADERS([rte_config.h],
@@
-2629,7
+2631,7
@@
then
SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$LIBDPDK_LDFLAGS $LDFLAGS"
AC_CHECK_LIB([dpdk], [rte_eal_init],
SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$LIBDPDK_LDFLAGS $LDFLAGS"
AC_CHECK_LIB([dpdk], [rte_eal_init],
- [with_libdp
kd
="yes"],
+ [with_libdp
dk
="yes"],
[with_libdpdk="no (symbol 'rte_eal_init' not found)"]
)
LDFLAGS="$SAVE_LDFLAGS"
[with_libdpdk="no (symbol 'rte_eal_init' not found)"]
)
LDFLAGS="$SAVE_LDFLAGS"
@@
-2919,15
+2921,15
@@
fi
if test "x$with_liblua" = "xyes"
then
if test "x$with_liblua" = "xyes"
then
- SAVE_C
FLAGS="$C
FLAGS"
- C
FLAGS="$C
FLAGS $LUA_CFLAGS"
+ SAVE_C
PPFLAGS="$CPP
FLAGS"
+ C
PPFLAGS="$CPP
FLAGS $LUA_CFLAGS"
AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h],
[with_liblua="yes"],
[with_liblua="no (header not found)"]
)
AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h],
[with_liblua="yes"],
[with_liblua="no (header not found)"]
)
- C
FLAGS="$SAVE_C
FLAGS"
+ C
PPFLAGS="$SAVE_CPP
FLAGS"
fi
if test "x$with_liblua" = "xyes"
fi
if test "x$with_liblua" = "xyes"
@@
-6332,7
+6334,7
@@
then
plugin_xencpu="yes"
fi
plugin_xencpu="yes"
fi
-if test "x$with_libdp
kd
" = "xyes"
+if test "x$with_libdp
dk
" = "xyes"
then
plugin_dpdkstat="yes"
fi
then
plugin_dpdkstat="yes"
fi