Changeset c04929c for configure.in

Timestamp:

08/02/13 17:30:15 (8 years ago)

Author:

Richard Sanger <rjs51@…>

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:

3799f51

Parents:

212faa13

Message:

Added the new live trace format Intel DPDK - See the wiki for more documentation

File:

• configure.in (modified) (5 diffs)

configure.in

@@ -374 +374 @@
 #DAG_VERSION_NUM=$dag_drv_v
 
+# Check for DPDK 
+AC_ARG_WITH(dpdk,
+            AS_HELP_STRING(--with-dpdk,include DPDK live capture support (Must set RTE_SDK/_TARGET enviroment variable)),
+[
+        if test "$withval" = no
+        then
+            want_dpdk=no
+        else
+            want_dpdk=ifpresent
+        fi
+],[
+        # Default to building without DPDK format
+        want_dpdk=ifpresent
+])
+
+libtrace_dpdk=false
+if test "$want_dpdk" != no; then
+    saved_ldflags="$LDFLAGS"
+    # Add to our libpath location
+    LDFLAGS="$LDFLAGS -L$RTE_SDK/$RTE_TARGET/lib/"
+    AC_CHECK_LIB(rte_eal, rte_eal_init, dpdk_found=1, dpdk_found=0, -lpthread -lrte_malloc -lethdev -lrte_mempool -lrte_ring)
+    # Revert back
+    LDFLAGS="$saved_ldflags"
+    if test "$dpdk_found" = 1; then
+        # Save these now so that they can be re-exported later
+                AC_SUBST([RTE_TARGET])
+        AC_SUBST([RTE_SDK])
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -lrte_eal -lrte_pmd_e1000 -lrte_pmd_ixgbe"
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -lethdev -lrte_mempool -lrte_ring -lrte_malloc"
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -lrte_mbuf"
+                AC_DEFINE(HAVE_DPDK,1,[conditional for building with DPDK live capture support])
+                libtrace_dpdk=true
+        fi
+fi
 
 # Checks for various "optional" libraries
@@ -389 +423 @@
 # Check to see if we have libdl - *BSD has built-in libdl
 AC_SEARCH_LIBS(dlopen,dl, dlfound=1,dlfound=0 )
+LIBS=
+
+# Check for clock_gettime
+AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=1, have_clock_gettime=0)
 LIBS=
 
@@ -417 +455 @@
                 LIBPKTDUMP_LIBS="$LIBPKTDUMP_LIBS $ac_cv_search_getservent"
         fi 
+fi
+
+if test "$have_get_clocktime" = 1; then
+    LIBTRACE_LIBS="$LIBTRACE_LIBS -lrt"
 fi
 
@@ -558 +600 @@
 AM_CONDITIONAL([HAVE_BPF_CAPTURE], [test "$ac_cv_have_decl_BIOCSETIF" = yes ])
 AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true])
+AM_CONDITIONAL([HAVE_DPDK], [test "$libtrace_dpdk" = true])
 AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag_version" = 24])
 AM_CONDITIONAL([DAG2_5], [test "$libtrace_dag_version" = 25])
@@ -632 +675 @@
         AC_MSG_NOTICE([Compiled with DAG live capture support: No])
 fi
+
+if test x"$libtrace_dpdk" = xtrue; then
+    AC_MSG_NOTICE([Compiled with DPDK live capture support: Yes])
+else
+    AC_MSG_NOTICE([Compiled with DPDK live capture support: No])
+fi
 reportopt "Compiled with LLVM BPF JIT support" $JIT
 reportopt "Building man pages/documentation" $libtrace_doxygen