X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=blobdiff_plain;f=acinclude.m4;h=e8a8a2e26b07899851775a39fbe90ff5a4075bbe;hp=63a036e3d16123082c2ce21ef53f967af26cba15;hb=HEAD;hpb=82d6256ac9f800f8cbe06cf2be41a7b76ab8b322 diff --git a/acinclude.m4 b/acinclude.m4 index 63a036e3d..e8a8a2e26 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,6 +1,6 @@ # -*- autoconf -*- -# Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. +# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,93 +25,162 @@ AC_DEFUN([OVS_ENABLE_WERROR], CFLAGS="$CFLAGS -Werror" fi])]) -dnl OVS_CHECK_LINUX26 +dnl OVS_CHECK_LINUX dnl dnl Configure linux kernel source tree -AC_DEFUN([OVS_CHECK_LINUX26], [ - AC_ARG_WITH([l26], - [AC_HELP_STRING([--with-l26=/path/to/linux-2.6], - [Specify the linux 2.6 kernel build directory])], - [KBUILD26="$withval"], [KBUILD26=])dnl - AC_ARG_WITH([l26-source], - [AC_HELP_STRING([--with-l26-source=/path/to/linux-2.6-source], - [Specify the linux 2.6 kernel source directory +AC_DEFUN([OVS_CHECK_LINUX], [ + AC_ARG_WITH([linux], + [AC_HELP_STRING([--with-linux=/path/to/linux], + [Specify the Linux kernel build directory])]) + 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)])], - [KSRC26="$withval"], [KSRC26=])dnl - if test -n "$KBUILD26"; then - KBUILD26=`eval echo "$KBUILD26"` - case $KBUILD26 in + directory)])]) + + # Deprecated equivalents to --with-linux, --with-linux-source. + AC_ARG_WITH([l26]) + AC_ARG_WITH([l26-source]) + + if test X"$with_linux" != X; then + KBUILD=$with_linux + elif test X"$with_l26" != X; then + KBUILD=$with_l26 + AC_MSG_WARN([--with-l26 is deprecated, please use --with-linux instead]) + else + KBUILD= + fi + + if test X"$KBUILD" != X; then + if test X"$with_linux_source" != X; then + KSRC=$with_linux_source + elif test X"$with_l26_source" != X; then + KSRC=$with_l26_source + AC_MSG_WARN([--with-l26-source is deprecated, please use --with-linux-source instead]) + else + KSRC= + fi + elif test X"$with_linux_source" != X || test X"$with_l26_source" != X; then + AC_MSG_ERROR([Linux source directory may not be specified without Linux build directory]) + fi + + if test -n "$KBUILD"; then + KBUILD=`eval echo "$KBUILD"` + case $KBUILD in /*) ;; - *) KBUILD26=`pwd`/$KBUILD26 ;; + *) KBUILD=`pwd`/$KBUILD ;; esac # The build directory is what the user provided. # Make sure that it exists. - AC_MSG_CHECKING([for Linux 2.6 build directory]) - if test -d "$KBUILD26"; then - AC_MSG_RESULT([$KBUILD26]) - AC_SUBST(KBUILD26) + AC_MSG_CHECKING([for Linux build directory]) + if test -d "$KBUILD"; then + AC_MSG_RESULT([$KBUILD]) + AC_SUBST(KBUILD) else AC_MSG_RESULT([no]) - AC_ERROR([source dir $KBUILD26 doesn't exist]) + AC_ERROR([source dir $KBUILD doesn't exist]) fi # Debian breaks kernel headers into "source" header and "build" headers. - # We want the source headers, but $KBUILD26 gives us the "build" headers. + # We want the source headers, but $KBUILD gives us the "build" headers. # Use heuristics to find the source headers. - AC_MSG_CHECKING([for Linux 2.6 source directory]) - if test -n "$KSRC26"; then - KSRC26=`eval echo "$KSRC26"` - case $KSRC26 in + AC_MSG_CHECKING([for Linux source directory]) + if test -n "$KSRC"; then + KSRC=`eval echo "$KSRC"` + case $KSRC in /*) ;; - *) KSRC26=`pwd`/$KSRC26 ;; + *) KSRC=`pwd`/$KSRC ;; esac - if test ! -e $KSRC26/include/linux/kernel.h; then - AC_MSG_ERROR([$KSRC26 is not a kernel source directory)]) + if test ! -e $KSRC/include/linux/kernel.h; then + AC_MSG_ERROR([$KSRC is not a kernel source directory]) fi else - KSRC26=$KBUILD26 - if test ! -e $KSRC26/include/linux/kernel.h; then - case `echo "$KBUILD26" | sed 's,/*$,,'` in # ( - */build) - KSRC26=`echo "$KBUILD26" | sed 's,/build/*$,/source,'` - ;; # ( - *) - KSRC26=`(cd $KBUILD26 && pwd -P) | sed 's,-[[^-]]*$,-common,'` - ;; - esac + KSRC=$KBUILD + if test ! -e $KSRC/include/linux/kernel.h; then + # Debian kernel build Makefiles tend to include a line of the form: + # MAKEARGS := -C /usr/src/linux-headers-3.2.0-1-common O=/usr/src/linux-headers-3.2.0-1-486 + # First try to extract the source directory from this line. + KSRC=`sed -n 's/.*-C \([[^ ]]*\).*/\1/p' "$KBUILD"/Makefile` + if test ! -e "$KSRC"/include/linux/kernel.h; then + # Didn't work. Fall back to name-based heuristics that used to work. + case `echo "$KBUILD" | sed 's,/*$,,'` in # ( + */build) + KSRC=`echo "$KBUILD" | sed 's,/build/*$,/source,'` + ;; # ( + *) + KSRC=`(cd $KBUILD && pwd -P) | sed 's,-[[^-]]*$,-common,'` + ;; + esac + fi fi - if test ! -e $KSRC26/include/linux/kernel.h; then - AC_MSG_ERROR([cannot find source directory (please use --with-l26-source)]) + if test ! -e "$KSRC"/include/linux/kernel.h; then + AC_MSG_ERROR([cannot find source directory (please use --with-linux-source)]) fi fi - AC_MSG_RESULT([$KSRC26]) + AC_MSG_RESULT([$KSRC]) AC_MSG_CHECKING([for kernel version]) - patchlevel=`sed -n 's/^PATCHLEVEL = //p' "$KSRC26/Makefile"` - sublevel=`sed -n 's/^SUBLEVEL = //p' "$KSRC26/Makefile"` - if test -z "$patchlevel" || test -z "$sublevel"; then + version=`sed -n 's/^VERSION = //p' "$KSRC/Makefile"` + patchlevel=`sed -n 's/^PATCHLEVEL = //p' "$KSRC/Makefile"` + sublevel=`sed -n 's/^SUBLEVEL = //p' "$KSRC/Makefile"` + if test X"$version" = X || test X"$patchlevel" = X; then AC_ERROR([cannot determine kernel version]) + elif test X"$sublevel" = X; then + kversion=$version.$patchlevel + else + kversion=$version.$patchlevel.$sublevel fi - AC_MSG_RESULT([2.$patchlevel.$sublevel]) - if test "2.$patchlevel" != '2.6'; then - if test "$BUILD26" = "$KSRC26"; then - AC_ERROR([Linux kernel in $KBUILD26 is not version 2.6]) + AC_MSG_RESULT([$kversion]) + + if test "$version" -ge 3; then + if test "$version" = 3 && test "$patchlevel" -le 14; then + : # Linux 3.x + else + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.14.x is not supported (please refer to the FAQ for advice)]) + fi + else + if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version 2.6.32 or later is required]) else - AC_ERROR([Linux kernel in build tree $KBUILD26 (source tree $KSRC26) is not version 2.6]) + : # Linux 2.6.x fi fi - if test ! -e "$KBUILD26"/include/linux/version.h || \ - (test ! -e "$KBUILD26"/include/linux/autoconf.h && \ - test ! -e "$KBUILD26"/include/generated/autoconf.h); then - AC_MSG_ERROR([Linux kernel source in $KBUILD26 is not configured]) + if (test ! -e "$KBUILD"/include/linux/version.h && \ + 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]) fi - OVS_CHECK_LINUX26_COMPAT - elif test -n "$KSRC26"; then - AC_MSG_ERROR([--with-l26-source may not be specified without --with-l26]) + OVS_CHECK_LINUX_COMPAT fi - AM_CONDITIONAL(L26_ENABLED, test -n "$KBUILD26") + AM_CONDITIONAL(LINUX_ENABLED, test -n "$KBUILD") +]) + +dnl OVS_CHECK_DPDK +dnl +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])]) + + 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" + + AC_DEFINE([DPDK_NETDEV], [1], [System uses the DPDK module.]) + else + RTE_SDK= + fi + + AM_CONDITIONAL([DPDK_NETDEV], test -n "$RTE_SDK") ]) dnl OVS_GREP_IFELSE(FILE, REGEX, [IF-MATCH], [IF-NO-MATCH]) @@ -147,12 +216,12 @@ dnl OVS_DEFINE(NAME) dnl dnl Defines NAME to 1 in kcompat.h. AC_DEFUN([OVS_DEFINE], [ - echo '#define $1 1' >> datapath/linux-2.6/kcompat.h.new + echo '#define $1 1' >> datapath/linux/kcompat.h.new ]) AC_DEFUN([OVS_CHECK_LOG2_H], [ - AC_MSG_CHECKING([for $KSRC26/include/linux/log2.h]) - if test -e $KSRC26/include/linux/log2.h; then + AC_MSG_CHECKING([for $KSRC/include/linux/log2.h]) + if test -e $KSRC/include/linux/log2.h; then AC_MSG_RESULT([yes]) OVS_DEFINE([HAVE_LOG2_H]) else @@ -160,79 +229,109 @@ AC_DEFUN([OVS_CHECK_LOG2_H], [ fi ]) -dnl OVS_CHECK_LINUX26_COMPAT +dnl OVS_CHECK_LINUX_COMPAT dnl dnl Runs various Autoconf checks on the Linux 2.6 kernel source in -dnl the directory in $KBUILD26. -AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [ - rm -f datapath/linux-2.6/kcompat.h.new - mkdir -p datapath/linux-2.6 - : > datapath/linux-2.6/kcompat.h.new +dnl the directory in $KBUILD. +AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ + rm -f datapath/linux/kcompat.h.new + mkdir -p datapath/linux + : > datapath/linux/kcompat.h.new - OVS_GREP_IFELSE([$KSRC26/arch/x86/include/asm/checksum_32.h], [src_err,], + OVS_GREP_IFELSE([$KSRC/arch/x86/include/asm/checksum_32.h], [src_err,], [OVS_DEFINE([HAVE_CSUM_COPY_DBG])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/err.h], [ERR_CAST]) + OVS_GREP_IFELSE([$KSRC/include/linux/err.h], [ERR_CAST]) + + OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [eth_hw_addr_random]) + OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [ether_addr_copy]) + + OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [vlan_set_encap_proto]) + + OVS_GREP_IFELSE([$KSRC/include/linux/in.h], [ipv4_is_multicast]) - OVS_GREP_IFELSE([$KSRC26/include/linux/in.h], [ipv4_is_multicast]) + 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/netdevice.h], [netdev_features_t]) + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [pcpu_sw_netstats]) - OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_disable_lro]) - OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_stats]) - OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_by_index_rcu]) + OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32]) - OVS_GREP_IFELSE([$KSRC26/include/linux/rcupdate.h], [rcu_read_lock_held], [], - [OVS_GREP_IFELSE([$KSRC26/include/linux/rtnetlink.h], + OVS_GREP_IFELSE([$KSRC/include/linux/rcupdate.h], [rcu_read_lock_held], [], + [OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h], [rcu_read_lock_held])]) + OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h], [lockdep_rtnl_is_held]) # Check for the proto_data_valid member in struct sk_buff. The [^@] # is necessary because some versions of this header remove the # member but retain the kerneldoc comment that describes it (which # starts with @). The brackets must be doubled because of m4 # quoting rules. - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [[[^@]]proto_data_valid], + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [[[^@]]proto_data_valid], [OVS_DEFINE([HAVE_PROTO_DATA_VALID])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [raw], - [OVS_DEFINE([HAVE_MAC_RAW])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_dst(], + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [rxhash]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_dst(], [OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_copy_from_linear_data_offset]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_cow_head]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_transport_header], + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], + [skb_reset_tail_pointer]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_cow_head]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_transport_header], [OVS_DEFINE([HAVE_SKBUFF_HEADER_HELPERS])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/icmpv6.h], [icmp6_hdr], + OVS_GREP_IFELSE([$KSRC/include/linux/icmpv6.h], [icmp6_hdr], [OVS_DEFINE([HAVE_ICMP6_HDR])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_warn_if_lro], + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_warn_if_lro], [OVS_DEFINE([HAVE_SKB_WARN_LRO])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [consume_skb]) - - OVS_GREP_IFELSE([$KSRC26/include/linux/string.h], [kmemdup], [], - [OVS_GREP_IFELSE([$KSRC26/include/linux/slab.h], [kmemdup])]) - - OVS_GREP_IFELSE([$KSRC26/include/linux/types.h], [bool], + 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_has_frag_list]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [__skb_fill_page_desc]) + 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/skbuff.h], [skb_orphan_frags]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_get_hash]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_clear_hash]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [l4_rxhash]) + + OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [bool], [OVS_DEFINE([HAVE_BOOL_TYPE])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/types.h], [__wsum], + 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([$KSRC26/include/net/checksum.h], [csum_replace4]) - OVS_GREP_IFELSE([$KSRC26/include/net/checksum.h], [csum_unfold]) + OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_replace4]) + OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_unfold]) - OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [NLA_NUL_STRING]) - OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [nla_get_be16]) - OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [nla_find_nested]) + OVS_GREP_IFELSE([$KSRC/include/net/genetlink.h], [parallel_ops]) + OVS_GREP_IFELSE([$KSRC/include/net/gre.h], [gre_cisco_register]) + 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([$KSRC26/include/linux/if_link.h], [rtnl_link_stats64]) + OVS_GREP_IFELSE([$KSRC/include/net/sctp/checksum.h], [sctp_compute_cksum]) - OVS_GREP_IFELSE([$KSRC26/include/linux/if_vlan.h], [ADD_ALL_VLANS_CMD], + 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-2.6/kcompat.h.new \ - datapath/linux-2.6/kcompat.h >/dev/null 2>&1; then - rm datapath/linux-2.6/kcompat.h.new + if cmp -s datapath/linux/kcompat.h.new \ + datapath/linux/kcompat.h >/dev/null 2>&1; then + rm datapath/linux/kcompat.h.new else - mv datapath/linux-2.6/kcompat.h.new datapath/linux-2.6/kcompat.h + mv datapath/linux/kcompat.h.new datapath/linux/kcompat.h fi ]) @@ -247,6 +346,23 @@ AC_DEFUN([OVS_CHECK_IF_PACKET], [Define to 1 if net/if_packet.h is available.]) fi]) +dnl Checks for net/if_dl.h. +dnl +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], + [HAVE_IF_DL=no]) + AM_CONDITIONAL([HAVE_IF_DL], [test "$HAVE_IF_DL" = yes]) + if test "$HAVE_IF_DL" = yes; then + AC_DEFINE([HAVE_IF_DL], [1], + [Define to 1 if net/if_dl.h is available.]) + + # On these platforms we use libpcap to access network devices. + AC_SEARCH_LIBS([pcap_open_live], [pcap]) + fi]) + dnl Checks for buggy strtok_r. dnl dnl Some versions of glibc 2.7 has a bug in strtok_r when compiling @@ -286,15 +402,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 @@ -304,6 +420,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. @@ -353,7 +484,7 @@ dnl OVS_MAKE_HAS_IF([if-true], [if-false]) dnl dnl Checks whether make has the GNU make $(if condition,then,else) extension. dnl Runs 'if-true' if so, 'if-false' otherwise. -AC_DEFUN([OVS_MAKE_HAS_IF], +AC_DEFUN([OVS_CHECK_MAKE_IF], [AC_CACHE_CHECK( [whether ${MAKE-make} has GNU make \$(if) extension], [ovs_cv_gnu_make_if], @@ -373,13 +504,127 @@ EOF ovs_cv_gnu_make_if=yes else ovs_cv_gnu_make_if=no - fi]) - AS_IF([test $ovs_cv_gnu_make_if = yes], [$1], [$2])]) + fi])]) + +dnl OVS_CHECK_GNU_MAKE +dnl +dnl Checks whether make is GNU make (because Linux kernel Makefiles +dnl only work with GNU make). +AC_DEFUN([OVS_CHECK_GNU_MAKE], + [AC_CACHE_CHECK( + [whether ${MAKE-make} is GNU make], + [ovs_cv_gnu_make], + [rm -f conftest.out + AS_ECHO(["$as_me:$LINENO: invoking ${MAKE-make} --version:"]) >&AS_MESSAGE_LOG_FD 2>&1 + ${MAKE-make} --version >conftest.out 2>&1 + cat conftest.out >&AS_MESSAGE_LOG_FD 2>&1 + result=`cat conftest.out` + rm -f conftest.mk conftest.out + + case $result in # ( + GNU*) ovs_cv_gnu_make=yes ;; # ( + *) ovs_cv_gnu_make=no ;; + esac]) + AM_CONDITIONAL([GNU_MAKE], [test $ovs_cv_gnu_make = yes])]) + +dnl OVS_CHECK_SPARSE_TARGET +dnl +dnl The "cgcc" script from "sparse" isn't very good at detecting the +dnl target for which the code is being built. This helps it out. +AC_DEFUN([OVS_CHECK_SPARSE_TARGET], + [AC_CACHE_CHECK( + [target hint for cgcc], + [ac_cv_sparse_target], + [AS_CASE([`$CC -dumpmachine 2>/dev/null`], + [i?86-* | athlon-*], [ac_cv_sparse_target=x86], + [x86_64-*], [ac_cv_sparse_target=x86_64], + [ac_cv_sparse_target=other])]) + AS_CASE([$ac_cv_sparse_target], + [x86], [SPARSEFLAGS= CGCCFLAGS=-target=i86], + [x86_64], [SPARSEFLAGS=-m64 CGCCFLAGS=-target=x86_64], + [SPARSEFLAGS= CGCCFLAGS=]) + AC_SUBST([SPARSEFLAGS]) + AC_SUBST([CGCCFLAGS])]) + +dnl OVS_SPARSE_EXTRA_INCLUDES +dnl +dnl The cgcc script from "sparse" does not search gcc's default +dnl search path. Get the default search path from GCC and pass +dnl them to sparse. +AC_DEFUN([OVS_SPARSE_EXTRA_INCLUDES], + AC_SUBST([SPARSE_EXTRA_INCLUDES], + [`$CC -v -E - &1 >/dev/null | sed -n -e '/^#include.*search.*starts.*here:/,/^End.*of.*search.*list\./s/^ \(.*\)/-I \1/p' |grep -v /usr/lib | grep -x -v '\-I /usr/include' | tr \\\n ' ' `] )) dnl OVS_ENABLE_SPARSE AC_DEFUN([OVS_ENABLE_SPARSE], - [OVS_MAKE_HAS_IF( - [AC_CONFIG_COMMANDS_PRE( - [: ${SPARSE=sparse} - AC_SUBST([SPARSE]) - CC='$(if $(C),REAL_CC="'"$CC"'" CHECK="$(SPARSE) -I $(top_srcdir)/include/sparse" cgcc,'"$CC"')'])])]) + [AC_REQUIRE([OVS_CHECK_SPARSE_TARGET]) + AC_REQUIRE([OVS_CHECK_MAKE_IF]) + AC_REQUIRE([OVS_SPARSE_EXTRA_INCLUDES]) + : ${SPARSE=sparse} + AC_SUBST([SPARSE]) + AC_CONFIG_COMMANDS_PRE( + [if test $ovs_cv_gnu_make_if = yes; then + CC='$(if $(C),env 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]) + +dnl OVS_CHECK_LINUX_HOST. +dnl +dnl Checks whether we're building for a Linux host, based on the presence of +dnl the __linux__ preprocessor symbol, and sets up an Automake conditional +dnl LINUX based on the result. +AC_DEFUN([OVS_CHECK_LINUX_HOST], + [AC_CACHE_CHECK( + [whether __linux__ is defined], + [ovs_cv_linux], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([enum { LINUX = __linux__};], [])], + [ovs_cv_linux=true], + [ovs_cv_linux=false])]) + AM_CONDITIONAL([LINUX], [$ovs_cv_linux])])