netlink-socket: Adapt to Windows and MSVC.

[cascardo/ovs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index e8a8a2e..aa9ffcd 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -35,8 +35,8 @@ AC_DEFUN([OVS_CHECK_LINUX], [
   AC_ARG_WITH([linux-source],
               [AC_HELP_STRING([--with-linux-source=/path/to/linux-source],
                               [Specify the Linux kernel source directory
-                              (usually figured out automatically from build
-                              directory)])])
+                               (usually figured out automatically from build
+                               directory)])])
 
   # Deprecated equivalents to --with-linux, --with-linux-source.
   AC_ARG_WITH([l26])
@@ -75,11 +75,11 @@ AC_DEFUN([OVS_CHECK_LINUX], [
     # Make sure that it exists.
     AC_MSG_CHECKING([for Linux build directory])
     if test -d "$KBUILD"; then
-       AC_MSG_RESULT([$KBUILD])
-       AC_SUBST(KBUILD)
+        AC_MSG_RESULT([$KBUILD])
+        AC_SUBST(KBUILD)
     else
-       AC_MSG_RESULT([no])
-       AC_ERROR([source dir $KBUILD doesn't exist])
+        AC_MSG_RESULT([no])
+        AC_ERROR([source dir $KBUILD doesn't exist])
     fi
 
     # Debian breaks kernel headers into "source" header and "build" headers.
@@ -150,7 +150,7 @@ AC_DEFUN([OVS_CHECK_LINUX], [
         test ! -e "$KBUILD"/include/generated/uapi/linux/version.h)|| \
        (test ! -e "$KBUILD"/include/linux/autoconf.h && \
         test ! -e "$KBUILD"/include/generated/autoconf.h); then
-       AC_MSG_ERROR([Linux kernel source in $KBUILD is not configured])
+        AC_MSG_ERROR([Linux kernel source in $KBUILD is not configured])
     fi
     OVS_CHECK_LINUX_COMPAT
   fi
@@ -163,17 +163,41 @@ dnl Configure DPDK source tree
 AC_DEFUN([OVS_CHECK_DPDK], [
   AC_ARG_WITH([dpdk],
               [AC_HELP_STRING([--with-dpdk=/path/to/dpdk],
-                              [Specify the DPDP build directory])])
+                              [Specify the DPDK build directory])])
 
   if test X"$with_dpdk" != X; then
     RTE_SDK=$with_dpdk
 
     DPDK_INCLUDE=$RTE_SDK/include
     DPDK_LIB_DIR=$RTE_SDK/lib
-    DPDK_LIBS="$DPDK_LIB_DIR/libintel_dpdk.a"
 
-    LIBS="$DPDK_LIBS $LIBS"
-    CPPFLAGS="-I$DPDK_INCLUDE $CPPFLAGS"
+    LDFLAGS="$LDFLAGS -L$DPDK_LIB_DIR"
+    CFLAGS="$CFLAGS -I$DPDK_INCLUDE"
+
+    # On some systems we have to add -ldl to link with dpdk
+    #
+    # This code, at first, tries to link without -ldl (""),
+    # then adds it and tries again.
+    # Before each attempt the search cache must be unset,
+    # otherwise autoconf will stick with the old result
+
+    found=false
+    save_LIBS=$LIBS
+    for extras in "" "-ldl"; do
+        LIBS="-lintel_dpdk $extras $save_LIBS"
+        AC_LINK_IFELSE(
+           [AC_LANG_PROGRAM([#include <rte_config.h>
+                             #include <rte_eal.h>],
+                            [int rte_argc; char ** rte_argv;
+                             rte_eal_init(rte_argc, rte_argv);])],
+           [found=true])
+        if $found; then
+            break
+        fi
+    done
+    if $found; then :; else
+        AC_MSG_ERROR([cannot link with dpdk])
+    fi
 
     AC_DEFINE([DPDK_NETDEV], [1], [System uses the DPDK module.])
   else
@@ -273,6 +297,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [[[^@]]proto_data_valid],
                   [OVS_DEFINE([HAVE_PROTO_DATA_VALID])])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [rxhash])
+  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [u16.*rxhash],
+                  [OVS_DEFINE([HAVE_U16_RXHASH])])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_dst(],
                   [OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], 
@@ -322,6 +348,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
 
   OVS_GREP_IFELSE([$KSRC/include/linux/percpu.h], [this_cpu_ptr])
 
+  OVS_GREP_IFELSE([$KSRC/include/linux/u64_stats_sync.h], [u64_stats_fetch_begin_irq])
+
   OVS_GREP_IFELSE([$KSRC/include/linux/openvswitch.h], [openvswitch_handle_frame_hook],
                   [OVS_DEFINE([HAVE_RHEL_OVS_HOOK])])
 
@@ -403,7 +431,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([_OVS_CHECK_CC_OPTION], [dnl
-  m4_define([ovs_cv_name], [ovs_cv_[]m4_translit([$1], [-], [_])])dnl
+  m4_define([ovs_cv_name], [ovs_cv_[]m4_translit([$1], [-=], [__])])dnl
   AC_CACHE_CHECK([whether $CC accepts $1], [ovs_cv_name], 
     [ovs_save_CFLAGS="$CFLAGS"
      dnl Include -Werror in the compiler options, because without -Werror
@@ -592,25 +620,25 @@ AC_DEFUN([OVS_CHECK_PTHREAD_SET_NAME],
        [for pthread_setname_np() variant],
        [ovs_cv_pthread_setname_np],
        [AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([#include <pthread.h>
+         [AC_LANG_PROGRAM([#include <pthread.h>
   ], [pthread_setname_np(pthread_self(), "name");])],
-        [ovs_cv_pthread_setname_np=glibc],
+         [ovs_cv_pthread_setname_np=glibc],
          [AC_LINK_IFELSE(
-          [AC_LANG_PROGRAM([#include <pthread.h>
+           [AC_LANG_PROGRAM([#include <pthread.h>
 ], [pthread_setname_np(pthread_self(), "%s", "name");])],
            [ovs_cv_pthread_setname_np=netbsd],
-          [ovs_cv_pthread_setname_np=none])])])
+           [ovs_cv_pthread_setname_np=none])])])
      case $ovs_cv_pthread_setname_np in # (
        glibc)
-         AC_DEFINE(
-           [HAVE_GLIBC_PTHREAD_SETNAME_NP], [1],
-           [Define to 1 if pthread_setname_np() is available and takes 2 parameters (like glibc).])
-         ;; # (
+          AC_DEFINE(
+            [HAVE_GLIBC_PTHREAD_SETNAME_NP], [1],
+            [Define to 1 if pthread_setname_np() is available and takes 2 parameters (like glibc).])
+          ;; # (
        netbsd)
-         AC_DEFINE(
-           [HAVE_NETBSD_PTHREAD_SETNAME_NP], [1],
-           [Define to 1 if pthread_setname_np() is available and takes 3 parameters (like NetBSD).])
-         ;;
+          AC_DEFINE(
+            [HAVE_NETBSD_PTHREAD_SETNAME_NP], [1],
+            [Define to 1 if pthread_setname_np() is available and takes 3 parameters (like NetBSD).])
+          ;;
      esac
    fi])