Changeset 2bef800

Timestamp:

02/20/14 17:10:27 (8 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:

• configure.in (modified) (4 diffs)

configure.in

@@ -117 +117 @@
         # check the major version number
 
-        major=${gcc_version%\.*\.*}
+        major=$(echo $gcc_version | cut -d'.' -f1)
+
+        #major=${gcc_version%\.*\.*}
 
         if test "$major" -lt 4; then
@@ -376 +378 @@
 # Check for DPDK 
 AC_ARG_WITH(dpdk,
-            AS_HELP_STRING(--with-dpdk,include DPDK live capture support (Must set RTE_SDK/_TARGET enviroment variable)),
+            AS_HELP_STRING(--with-dpdk,include DPDK live capture support (Must set RTE_SDK/_TARGET environment variable)),
 [
         if test "$withval" = no
@@ -386 +388 @@
 ],[
         # Default to building without DPDK format
-        want_dpdk=ifpresent
+        want_dpdk=no
 ])
 
@@ -683 +685 @@
 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 (Requires DPDK v1.5 or newer)])
+elif test x"$want_dpdk" != "xno"; then
+#   We don't officially support DPDK so only report failure if the user
+#   explicitly asked for DPDK. That way, we can hopefully keep it hidden
+#   from most users for now...
+        
+    AC_MSG_NOTICE([Compiled with DPDK live capture support: No])
+    AC_MSG_NOTICE([Note: Requires DPDK v1.5 or newer])
 fi
 reportopt "Compiled with LLVM BPF JIT support" $JIT