ovs-ctl: do not attempt to restore flows when called with --delete-bridges

[cascardo/ovs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 14907ab..45cfaf6 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -175,7 +175,11 @@ AC_DEFUN([OVS_CHECK_DPDK], [
     DPDK_LIB="-lintel_dpdk"
     DPDK_EXTRA_LIB=""
 
-    OVS_GREP_IFELSE([$RTE_SDK/include/rte_config.h], [define RTE_LIBRTE_VHOST_USER 1],
+    AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM([#include <$RTE_SDK/include/rte_config.h>
+#if !RTE_LIBRTE_VHOST_USER
+#error
+#endif], [])],
                     [], [AC_DEFINE([VHOST_CUSE], [1], [DPDK vhost-cuse support enabled, vhost-user disabled.])
                          DPDK_EXTRA_LIB="-lfuse"])
 
@@ -271,7 +275,7 @@ dnl translated to uppercase.
 AC_DEFUN([OVS_FIND_FIELD_IFELSE], [
   AC_MSG_CHECKING([whether $2 has member $3 in $1])
   if test -f $1; then
-    awk '/$2.{/,/^}/' $1 2>/dev/null | grep '$3'
+    awk '/$2.{/,/^}/' $1 2>/dev/null | grep '$3' >/dev/null
     status=$?
     case $status in
       0)