Changeset 2bef800 for configure.in


Ignore:
Timestamp:
02/20/14 17:10:27 (7 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
fbd4ba6
Parents:
accdd5b
Message:

Changes to configure script prior to 3.0.19 release

  • Try to hide DPDK as much as possible for now, as I don't want to be supporting it in the upcoming release -- I'd like to spend more time testing it in production first.
  • Fix bad GCC version check, as it was failing for gcc 4.7
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r2138553 r2bef800  
    117117        # check the major version number
    118118
    119         major=${gcc_version%\.*\.*}
     119        major=$(echo $gcc_version | cut -d'.' -f1)
     120
     121        #major=${gcc_version%\.*\.*}
    120122
    121123        if test "$major" -lt 4; then
     
    376378# Check for DPDK
    377379AC_ARG_WITH(dpdk,
    378             AS_HELP_STRING(--with-dpdk,include DPDK live capture support (Must set RTE_SDK/_TARGET enviroment variable)),
     380            AS_HELP_STRING(--with-dpdk,include DPDK live capture support (Must set RTE_SDK/_TARGET environment variable)),
    379381[
    380382        if test "$withval" = no
     
    386388],[
    387389        # Default to building without DPDK format
    388         want_dpdk=ifpresent
     390        want_dpdk=no
    389391])
    390392
     
    683685if test x"$libtrace_dpdk" = xtrue; then
    684686    AC_MSG_NOTICE([Compiled with DPDK live capture support: Yes])
    685 else
    686     AC_MSG_NOTICE([Compiled with DPDK live capture support: No (Requires DPDK v1.5 or newer)])
     687elif test x"$want_dpdk" != "xno"; then
     688#   We don't officially support DPDK so only report failure if the user
     689#   explicitly asked for DPDK. That way, we can hopefully keep it hidden
     690#   from most users for now...
     691       
     692    AC_MSG_NOTICE([Compiled with DPDK live capture support: No])
     693    AC_MSG_NOTICE([Note: Requires DPDK v1.5 or newer])
    687694fi
    688695reportopt "Compiled with LLVM BPF JIT support" $JIT
Note: See TracChangeset for help on using the changeset viewer.