summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a7ec0c)
raw | patch | inline | side by side (parent: 8a7ec0c)
author | Maryam Tahhan <maryam.tahhan@intel.com> | |
Sun, 3 Apr 2016 09:29:13 +0000 (10:29 +0100) | ||
committer | Kim Jones <kim-marie.jones@intel.com> | |
Thu, 28 Jul 2016 12:15:43 +0000 (13:15 +0100) |
Modify the configuration in the situation where DPDK is not selected as
an option.
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
an option.
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
configure.ac | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index c661c562dc2df8fe04fc886dd65603a0bea1e0ad..94ed6e77444ad1fc06620a34ee2e9d351ae37b99 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2417,16 +2417,16 @@ AC_ARG_WITH(libdpdk, [AS_HELP_STRING([--with-libdpdk@<:@=PREFIX@:>@], [Path to t
if test "x$withval" != "xno" && test "x$withval" != "xyes"
then
with_dpdk_path="$withval"
- with_dpdk="yes"
+ with_libdpdk="yes"
else
if test "x$withval" = "xno"
then
- with_dpdk="no (disabled)"
+ with_libdpdk="no (disabled)"
fi
fi
-], [with_dpdk="yes"])
+], [with_libdpdk="no"])
-if test "x$with_dpdk" = "xyes"
+if test "x$with_libdpdk" = "xyes"
then
RTE_BUILD="$with_dpdk_path"
DPDK_INCLUDE="$RTE_BUILD/include/dpdk"
LIBS="$LIBS $DPDK_LIB $DPDK_EXTRA_LIB"
AC_CHECK_LIB(dpdk, rte_eal_init,
[with_libdpdk="yes"],
- [with_libdpdk="DPDK not found"])
+ [with_libdpdk="no"])
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
]]
)],
[FOUND_DPDK=true])
- if $FOUND_DPDK; then :; else
- AC_MSG_ERROR([cannot link with dpdk])
- fi
- DPDK_LDFLAGS="-ldpdk"
CFLAGS="$SAVE_CFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
LIBS="$SAVE_LIBS"
+ if $FOUND_DPDK; then :; else
+ AC_MSG_ERROR([cannot link with dpdk])
+ fi
+ DPDK_LDFLAGS="-ldpdk"
BUILD_WITH_DPDK_CFLAGS="-I$DPDK_INCLUDE -fPIC"
BUILD_WITH_DPDK_LDFLAGS="-L$DPDK_LIB_DIR"
BUILD_WITH_DPDK_LIBS="$DPDK_LDFLAGS -ldl -lpthread -lrt -lm"