ofp-util: Correct setting of Flow Mod cookie on encode

[sliver-openvswitch.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 10b214e..6fb30fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,7 @@ if test "$PERL" = no; then
    AC_MSG_ERROR([Perl interpreter not found in $PATH or $PERL.])
 fi
 
-AC_PATH_PROG([AUTOM4TE], autom4te, no)
-if test "$AUTOM4TE" = no; then
-   AC_MSG_ERROR([autom4te not found in $PATH or $AUTOM4TE.])
-fi
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
 
 AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN
@@ -48,6 +45,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt])
 AC_SEARCH_LIBS([timer_create], [rt])
 AC_SEARCH_LIBS([pcap_open_live], [pcap])
 
+OVS_CHECK_ESX
 OVS_CHECK_COVERAGE
 OVS_CHECK_NDEBUG
 OVS_CHECK_NETLINK
@@ -115,4 +113,9 @@ AC_CONFIG_COMMANDS([include/openflow/openflow.h.stamp])
 AC_CONFIG_COMMANDS([ovsdb/ovsdbmonitor/dummy], [:])
 AC_CONFIG_COMMANDS([utilities/bugtool/dummy], [:])
 
+AM_CONDITIONAL([LINUX_DATAPATH], [test "$HAVE_NETLINK" = yes && test "$ESX" = no])
+if test "$HAVE_NETLINK" = yes && test "$ESX" = no; then
+    AC_DEFINE([LINUX_DATAPATH], [1], [System uses the linux datapath module.])
+fi
+
 AC_OUTPUT