Changeset e26bd1a

Timestamp:

11/14/17 14:37:09 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

186a19e

Parents:

9d00fb13

Message:

Update DPDK configure check to look for libdpdk.so

File:

• configure.in (modified) (2 diffs)

configure.in

@@ -403 +403 @@
         # So instead simply check for existence
         if test "$RTE_SDK" != ""; then
-                AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libintel_dpdk.a", dpdk_found="libintel_dpdk.a", dpdk_found=0)
+                AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libintel_dpdk.a", dpdk_found=":libintel_dpdk.a", dpdk_found=0)
         fi
         # DPDK 2.1.0+ renames this to libdpdk from libintel_dpdk
         if test "$dpdk_found" = 0 -a "$RTE_SDK" != ""; then
-                AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libdpdk.a", dpdk_found="libdpdk.a", dpdk_found=0)
+                AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libdpdk.a", dpdk_found=":libdpdk.a", dpdk_found=0)
+        fi
+        if test "$dpdk_found" = 0 -a "$RTE_SDK" != ""; then
+                AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libdpdk.so", dpdk_found="dpdk", dpdk_found=0)
         fi
         if test "$dpdk_found" != 0 -a "$RTE_SDK" != ""; then
@@ -414 +417 @@
                 AC_SUBST([RTE_SDK])
                 # Force dpdk library to be statically linked to allow compiler optimisations
-                LIBTRACE_LIBS="$LIBTRACE_LIBS -Wl,--whole-archive -Wl,-l:$dpdk_found -Wl,--no-whole-archive -Wl,-lm"
+                LIBTRACE_LIBS="$LIBTRACE_LIBS -Wl,--whole-archive -Wl,-l$dpdk_found -Wl,--no-whole-archive -Wl,-lm"
                 AC_DEFINE(HAVE_DPDK,1,[conditional for building with DPDK live capture support])
                 libtrace_dpdk=true