X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=acinclude.m4;h=6033bfa381a621405ee665b650fbfdab1fb904cc;hb=8a8cd0acd09763f5edca6506bb286447c5776778;hp=911a23d54969f17da9ff64c98c6f150d130dacdf;hpb=32e96ab70304cb22b172a7b57bd3a1da97775a80;p=sliver-openvswitch.git diff --git a/acinclude.m4 b/acinclude.m4 index 911a23d54..6033bfa38 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -224,6 +224,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_disable_lro]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_get_stats]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_get_by_index_rcu]) + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [__skb_gso_segment]) + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [can_checksum_protocol]) OVS_GREP_IFELSE([$KSRC/include/linux/rcupdate.h], [rcu_read_lock_held], [], [OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h], @@ -254,6 +256,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [consume_skb]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_frag_page]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_reset_mac_len]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_unclone]) OVS_GREP_IFELSE([$KSRC/include/linux/string.h], [kmemdup], [], [OVS_GREP_IFELSE([$KSRC/include/linux/slab.h], [kmemdup])]) @@ -262,17 +265,27 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_BOOL_TYPE])]) OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [__wsum], [OVS_DEFINE([HAVE_CSUM_TYPES])]) + OVS_GREP_IFELSE([$KSRC/include/uapi/linux/types.h], [__wsum], + [OVS_DEFINE([HAVE_CSUM_TYPES])]) OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_replace4]) OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_unfold]) OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [NLA_NUL_STRING]) OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_get_be16]) + OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_put_be16]) + OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_put_be32]) + OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_put_be64]) OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_find_nested]) OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [ADD_ALL_VLANS_CMD], [OVS_DEFINE([HAVE_VLAN_BUG_WORKAROUND])]) + OVS_GREP_IFELSE([$KSRC/include/linux/percpu.h], [this_cpu_ptr]) + + OVS_GREP_IFELSE([$KSRC/include/linux/openvswitch.h], [openvswitch_handle_frame_hook], + [OVS_DEFINE([HAVE_RHEL_OVS_HOOK])]) + OVS_CHECK_LOG2_H if cmp -s datapath/linux/kcompat.h.new \ @@ -296,7 +309,8 @@ AC_DEFUN([OVS_CHECK_IF_PACKET], dnl Checks for net/if_dl.h. dnl -dnl (We use this as a proxy for checking whether we're building on FreeBSD.) +dnl (We use this as a proxy for checking whether we're building on FreeBSD +dnl or NetBSD.) AC_DEFUN([OVS_CHECK_IF_DL], [AC_CHECK_HEADER([net/if_dl.h], [HAVE_IF_DL=yes], @@ -306,7 +320,7 @@ AC_DEFUN([OVS_CHECK_IF_DL], AC_DEFINE([HAVE_IF_DL], [1], [Define to 1 if net/if_dl.h is available.]) - # On FreeBSD we use libpcap to access network devices. + # On these platforms we use libpcap to access network devices. AC_SEARCH_LIBS([pcap_open_live], [pcap]) fi]) @@ -349,15 +363,15 @@ dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl OVS_CHECK_CC_OPTION([OPTION], [ACTION-IF-ACCEPTED], [ACTION-IF-REJECTED]) -dnl Check whether the given C compiler OPTION is accepted. -dnl If so, execute ACTION-IF-ACCEPTED, otherwise ACTION-IF-REJECTED. -AC_DEFUN([OVS_CHECK_CC_OPTION], -[ +AC_DEFUN([_OVS_CHECK_CC_OPTION], [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" - CFLAGS="$CFLAGS $1" + dnl Include -Werror in the compiler options, because without -Werror + dnl clang's GCC-compatible compiler driver does not return a failure + dnl exit status even though it complains about options it does not + dnl understand. + CFLAGS="$CFLAGS $WERROR $1" AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,)], [ovs_cv_name[]=yes], [ovs_cv_name[]=no]) CFLAGS="$ovs_save_CFLAGS"]) if test $ovs_cv_name = yes; then @@ -367,6 +381,21 @@ AC_DEFUN([OVS_CHECK_CC_OPTION], fi ]) +dnl OVS_CHECK_WERROR +dnl +dnl Check whether the C compiler accepts -Werror. +dnl Sets $WERROR to "-Werror", if so, and otherwise to the empty string. +AC_DEFUN([OVS_CHECK_WERROR], + [WERROR= + _OVS_CHECK_CC_OPTION([-Werror], [WERROR=-Werror])]) + +dnl OVS_CHECK_CC_OPTION([OPTION], [ACTION-IF-ACCEPTED], [ACTION-IF-REJECTED]) +dnl Check whether the given C compiler OPTION is accepted. +dnl If so, execute ACTION-IF-ACCEPTED, otherwise ACTION-IF-REJECTED. +AC_DEFUN([OVS_CHECK_CC_OPTION], + [AC_REQUIRE([OVS_CHECK_WERROR]) + _OVS_CHECK_CC_OPTION([$1], [$2], [$3])]) + dnl OVS_ENABLE_OPTION([OPTION]) dnl Check whether the given C compiler OPTION is accepted. dnl If so, add it to WARNING_FLAGS. @@ -498,3 +527,50 @@ AC_DEFUN([OVS_ENABLE_SPARSE], [if test $ovs_cv_gnu_make_if = yes; then CC='$(if $(C),REAL_CC="'"$CC"'" CHECK="$(SPARSE) -I $(top_srcdir)/include/sparse $(SPARSEFLAGS) $(SPARSE_EXTRA_INCLUDES) " cgcc $(CGCCFLAGS),'"$CC"')' fi])]) + +dnl OVS_PTHREAD_SET_NAME +dnl +dnl This checks for three known variants of pthreads functions for setting +dnl the name of the current thread: +dnl +dnl glibc: int pthread_setname_np(pthread_t, const char *name); +dnl NetBSD: int pthread_setname_np(pthread_t, const char *format, void *arg); +dnl FreeBSD: int pthread_set_name_np(pthread_t, const char *name); +dnl +dnl For glibc and FreeBSD, the arguments are just a thread and its name. For +dnl NetBSD, 'format' is a printf() format string and 'arg' is an argument to +dnl provide to it. +dnl +dnl This macro defines: +dnl +dnl glibc: HAVE_GLIBC_PTHREAD_SETNAME_NP +dnl NetBSD: HAVE_NETBSD_PTHREAD_SETNAME_NP +dnl FreeBSD: HAVE_PTHREAD_SET_NAME_NP +AC_DEFUN([OVS_CHECK_PTHREAD_SET_NAME], + [AC_CHECK_FUNCS([pthread_set_name_np]) + if test $ac_cv_func_pthread_set_name_np != yes; then + AC_CACHE_CHECK( + [for pthread_setname_np() variant], + [ovs_cv_pthread_setname_np], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include + ], [pthread_setname_np(pthread_self(), "name");])], + [ovs_cv_pthread_setname_np=glibc], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include +], [pthread_setname_np(pthread_self(), "%s", "name");])], + [ovs_cv_pthread_setname_np=netbsd], + [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).]) + ;; # ( + 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])