Changeset e26bd1a for configure.in


Ignore:
Timestamp:
11/14/17 14:37:09 (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    rd47ca18 re26bd1a  
    403403        # So instead simply check for existence
    404404        if test "$RTE_SDK" != ""; then
    405                 AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libintel_dpdk.a", dpdk_found="libintel_dpdk.a", dpdk_found=0)
     405                AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libintel_dpdk.a", dpdk_found=":libintel_dpdk.a", dpdk_found=0)
    406406        fi
    407407        # DPDK 2.1.0+ renames this to libdpdk from libintel_dpdk
    408408        if test "$dpdk_found" = 0 -a "$RTE_SDK" != ""; then
    409                 AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libdpdk.a", dpdk_found="libdpdk.a", dpdk_found=0)
     409                AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libdpdk.a", dpdk_found=":libdpdk.a", dpdk_found=0)
     410        fi
     411        if test "$dpdk_found" = 0 -a "$RTE_SDK" != ""; then
     412                AC_CHECK_FILE("$RTE_SDK/$RTE_TARGET/lib/libdpdk.so", dpdk_found="dpdk", dpdk_found=0)
    410413        fi
    411414        if test "$dpdk_found" != 0 -a "$RTE_SDK" != ""; then
     
    414417                AC_SUBST([RTE_SDK])
    415418                # Force dpdk library to be statically linked to allow compiler optimisations
    416                 LIBTRACE_LIBS="$LIBTRACE_LIBS -Wl,--whole-archive -Wl,-l:$dpdk_found -Wl,--no-whole-archive -Wl,-lm"
     419                LIBTRACE_LIBS="$LIBTRACE_LIBS -Wl,--whole-archive -Wl,-l$dpdk_found -Wl,--no-whole-archive -Wl,-lm"
    417420                AC_DEFINE(HAVE_DPDK,1,[conditional for building with DPDK live capture support])
    418421                libtrace_dpdk=true
Note: See TracChangeset for help on using the changeset viewer.