X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=acinclude.m4;h=69bb7727d0fe5f15a47e110ea88302db62568075;hb=refs%2Fheads%2Fbranch-1.5;hp=42949209755d4702ce8d614a0cdd279527fca108;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=sliver-openvswitch.git diff --git a/acinclude.m4 b/acinclude.m4 index 429492097..69bb7727d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,6 +1,6 @@ # -*- autoconf -*- -# Copyright (c) 2008, 2009 Nicira Networks. +# Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,99 +14,185 @@ # See the License for the specific language governing permissions and # limitations under the License. -dnl Checks for --disable-userspace. -AC_DEFUN([OVS_CHECK_USERSPACE], +dnl OVS_ENABLE_WERROR +AC_DEFUN([OVS_ENABLE_WERROR], [AC_ARG_ENABLE( - [userspace], - [AC_HELP_STRING([--disable-userspace], - [Disable building userspace components.])], - [case "${enableval}" in - (yes) build_userspace=true ;; - (no) build_userspace=false ;; - (*) AC_MSG_ERROR([bad value ${enableval} for --enable-userspace]) ;; - esac], - [build_userspace=true]) - AM_CONDITIONAL([ENABLE_USERSPACE], [$build_userspace])]) - -dnl OVS_CHECK_LINUX(OPTION, VERSION, VARIABLE, CONDITIONAL) + [Werror], + [AC_HELP_STRING([--enable-Werror], [Add -Werror to CFLAGS])], + [], [enable_Werror=no]) + AC_CONFIG_COMMANDS_PRE( + [if test "X$enable_Werror" = Xyes; then + CFLAGS="$CFLAGS -Werror" + fi])]) + +dnl OVS_CHECK_LINUX dnl dnl Configure linux kernel source tree AC_DEFUN([OVS_CHECK_LINUX], [ - AC_ARG_WITH([$1], - [AC_HELP_STRING([--with-$1=/path/to/linux-$2], - [Specify the linux $2 kernel sources])], - [path="$withval"], [path=])dnl - if test -n "$path"; then - path=`eval echo "$path"` - - AC_MSG_CHECKING([for $path directory]) - if test -d "$path"; then - AC_MSG_RESULT([yes]) - $3=$path - AC_SUBST($3) + 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)])]) + + # 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 + /*) ;; + *) KBUILD=`pwd`/$KBUILD ;; + esac + + # The build directory is what the user provided. + # Make sure that it exists. + 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 $path 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 $KBUILD gives us the "build" headers. + # Use heuristics to find the source headers. + AC_MSG_CHECKING([for Linux source directory]) + if test -n "$KSRC"; then + KSRC=`eval echo "$KSRC"` + case $KSRC in + /*) ;; + *) KSRC=`pwd`/$KSRC ;; + esac + if test ! -e $KSRC/include/linux/kernel.h; then + AC_MSG_ERROR([$KSRC is not a kernel source directory]) + fi + else + 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 "$KSRC"/include/linux/kernel.h; then + AC_MSG_ERROR([cannot find source directory (please use --with-linux-source)]) + fi + fi + AC_MSG_RESULT([$KSRC]) + + AC_MSG_CHECKING([for kernel version]) + 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([$kversion]) - AC_MSG_CHECKING([for $path kernel version]) - patchlevel=`sed -n 's/^PATCHLEVEL = //p' "$path/Makefile"` - sublevel=`sed -n 's/^SUBLEVEL = //p' "$path/Makefile"` - AC_MSG_RESULT([2.$patchlevel.$sublevel]) - if test "2.$patchlevel" != '$2'; then - AC_ERROR([Linux kernel source in $path is not version $2]) + if test "$version" -ge 3; then + : # Linux 3.x + elif test "$version" = 2 && test "$patchlevel" -ge 6; then + : # Linux 2.6.x + else + if test "$KBUILD" = "$KSRC"; then + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version 2.6 or later is required]) + else + AC_ERROR([Linux kernel in build tree $KBUILD (source tree $KSRC) is version $kversion, but version 2.6 or later is required]) + fi fi - if ! test -e "$path"/include/linux/version.h || \ - ! test -e "$path"/include/linux/autoconf.h; then - AC_MSG_ERROR([Linux kernel source in $path is not configured]) + if test ! -e "$KBUILD"/include/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 - m4_if($2, [2.6], [OVS_CHECK_LINUX26_COMPAT]) + OVS_CHECK_LINUX_COMPAT fi - AM_CONDITIONAL($4, test -n "$path") + AM_CONDITIONAL(LINUX_ENABLED, test -n "$KBUILD") ]) -dnl OVS_GREP_IFELSE(FILE, REGEX, IF-MATCH, IF-NO-MATCH) +dnl OVS_GREP_IFELSE(FILE, REGEX, [IF-MATCH], [IF-NO-MATCH]) dnl dnl Greps FILE for REGEX. If it matches, runs IF-MATCH, otherwise IF-NO-MATCH. +dnl If IF-MATCH is empty then it defines to OVS_DEFINE(HAVE_), with +dnl translated to uppercase. AC_DEFUN([OVS_GREP_IFELSE], [ AC_MSG_CHECKING([whether $2 matches in $1]) - grep '$2' $1 >/dev/null 2>&1 - status=$? - case $status in - 0) - AC_MSG_RESULT([yes]) - $3 - ;; - 1) - AC_MSG_RESULT([no]) - $4 - ;; - *) - AC_MSG_ERROR([grep exited with status $status]) - ;; - esac + if test -f $1; then + grep '$2' $1 >/dev/null 2>&1 + status=$? + case $status in + 0) + AC_MSG_RESULT([yes]) + m4_if([$3], [], [OVS_DEFINE([HAVE_]m4_toupper([$2]))], [$3]) + ;; + 1) + AC_MSG_RESULT([no]) + $4 + ;; + *) + AC_MSG_ERROR([grep exited with status $status]) + ;; + esac + else + AC_MSG_RESULT([file not found]) + $4 + fi ]) 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 -]) - -AC_DEFUN([OVS_CHECK_VETH], [ - AC_MSG_CHECKING([whether to build veth module]) - if test "$sublevel" = 18; then - AC_MSG_RESULT([yes]) - AC_SUBST([BUILD_VETH], 1) - else - AC_MSG_RESULT([no]) - fi + 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 @@ -114,32 +200,79 @@ 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 $KSRC26. -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 - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_transport_header], - [OVS_DEFINE([HAVE_SKBUFF_HEADER_HELPERS])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [raw], +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([$KSRC/arch/x86/include/asm/checksum_32.h], [src_err,], + [OVS_DEFINE([HAVE_CSUM_COPY_DBG])]) + + OVS_GREP_IFELSE([$KSRC/include/linux/err.h], [ERR_CAST]) + + OVS_GREP_IFELSE([$KSRC/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/rcupdate.h], [rcu_read_lock_held], [], + [OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h], + [rcu_read_lock_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([$KSRC/include/linux/skbuff.h], [[[^@]]proto_data_valid], + [OVS_DEFINE([HAVE_PROTO_DATA_VALID])]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [raw], [OVS_DEFINE([HAVE_MAC_RAW])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], - [skb_copy_from_linear_data_offset], - [OVS_DEFINE([HAVE_SKB_COPY_FROM_LINEAR_DATA_OFFSET])]) - OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [NLA_NUL_STRING], - [OVS_DEFINE([HAVE_NLA_NUL_STRING])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/err.h], [ERR_CAST], - [OVS_DEFINE([HAVE_ERR_CAST])]) + 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], + [skb_copy_from_linear_data_offset]) + 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([$KSRC/include/linux/icmpv6.h], [icmp6_hdr], + [OVS_DEFINE([HAVE_ICMP6_HDR])]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_warn_if_lro], + [OVS_DEFINE([HAVE_SKB_WARN_LRO])]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [consume_skb]) + + OVS_GREP_IFELSE([$KSRC/include/linux/string.h], [kmemdup], [], + [OVS_GREP_IFELSE([$KSRC/include/linux/slab.h], [kmemdup])]) + + OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [bool], + [OVS_DEFINE([HAVE_BOOL_TYPE])]) + OVS_GREP_IFELSE([$KSRC/include/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_find_nested]) + + OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [ADD_ALL_VLANS_CMD], + [OVS_DEFINE([HAVE_VLAN_BUG_WORKAROUND])]) + OVS_CHECK_LOG2_H - OVS_CHECK_VETH - 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 ]) @@ -173,6 +306,7 @@ AC_DEFUN([OVS_CHECK_STRTOK_R], char *token1, *token2; token1 = strtok_r(string, ":", &save_ptr); token2 = strtok_r(NULL, ":", &save_ptr); + freopen ("/dev/null", "w", stdout); printf ("%s %s\n", token1, token2); return 0; ]])], @@ -204,7 +338,7 @@ AC_DEFUN([OVS_CHECK_CC_OPTION], 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 - m4_if([$2], [], [;], [$2]) + m4_if([$2], [], [:], [$2]) else m4_if([$3], [], [:], [$3]) fi @@ -212,8 +346,100 @@ AC_DEFUN([OVS_CHECK_CC_OPTION], dnl OVS_ENABLE_OPTION([OPTION]) dnl Check whether the given C compiler OPTION is accepted. -dnl If so, add it to CFLAGS. +dnl If so, add it to WARNING_FLAGS. dnl Example: OVS_ENABLE_OPTION([-Wdeclaration-after-statement]) AC_DEFUN([OVS_ENABLE_OPTION], - [OVS_CHECK_CC_OPTION([$1], [CFLAGS="$CFLAGS $1"])]) + [OVS_CHECK_CC_OPTION([$1], [WARNING_FLAGS="$WARNING_FLAGS $1"]) + AC_SUBST([WARNING_FLAGS])]) + +dnl OVS_CONDITIONAL_CC_OPTION([OPTION], [CONDITIONAL]) +dnl Check whether the given C compiler OPTION is accepted. +dnl If so, enable the given Automake CONDITIONAL. + +dnl Example: OVS_CONDITIONAL_CC_OPTION([-Wno-unused], [HAVE_WNO_UNUSED]) +AC_DEFUN([OVS_CONDITIONAL_CC_OPTION], + [OVS_CHECK_CC_OPTION( + [$1], [ovs_have_cc_option=yes], [ovs_have_cc_option=no]) + AM_CONDITIONAL([$2], [test $ovs_have_cc_option = yes])]) dnl ---------------------------------------------------------------------- + +dnl Check for too-old XenServer. +AC_DEFUN([OVS_CHECK_XENSERVER_VERSION], + [AC_CACHE_CHECK([XenServer release], [ovs_cv_xsversion], + [if test -e /etc/redhat-release; then + ovs_cv_xsversion=`sed -n 's/^XenServer DDK release \([[^-]]*\)-.*/\1/p' /etc/redhat-release` + fi + if test -z "$ovs_cv_xsversion"; then + ovs_cv_xsversion=none + fi]) + case $ovs_cv_xsversion in + none) + ;; + + [[1-9]][[0-9]]* | dnl XenServer 10 or later + [[6-9]]* | dnl XenServer 6 or later + 5.[[7-9]]* | dnl XenServer 5.7 or later + 5.6.[[1-9]][[0-9]][[0-9]][[0-9]]* | dnl XenServer 5.6.1000 or later + 5.6.[[2-9]][[0-9]][[0-9]]* | dnl XenServer 5.6.200 or later + 5.6.1[[0-9]][[0-9]]) dnl Xenserver 5.6.100 or later + ;; + + *) + AC_MSG_ERROR([This appears to be XenServer $ovs_cv_xsversion, but only XenServer 5.6.100 or later is supported. (If you are really using a supported version of XenServer, you may override this error message by specifying 'ovs_cv_xsversion=5.6.100' on the "configure" command line.)]) + ;; + esac]) + +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_CACHE_CHECK( + [whether ${MAKE-make} has GNU make \$(if) extension], + [ovs_cv_gnu_make_if], + [cat <<'EOF' > conftest.mk +conftest.out: + echo $(if x,y,z) > conftest.out +.PHONY: all +EOF + rm -f conftest.out + AS_ECHO(["$as_me:$LINENO: invoking ${MAKE-make} -f conftest.mk all:"]) >&AS_MESSAGE_LOG_FD 2>&1 + ${MAKE-make} -f conftest.mk conftest.out >&AS_MESSAGE_LOG_FD 2>&1 + AS_ECHO(["$as_me:$LINENO: conftest.out contains:"]) >&AS_MESSAGE_LOG_FD 2>&1 + cat conftest.out >&AS_MESSAGE_LOG_FD 2>&1 + result=`cat conftest.out` + rm -f conftest.mk conftest.out + if test "X$result" = "Xy"; then + 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])]) + +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_ENABLE_SPARSE +AC_DEFUN([OVS_ENABLE_SPARSE], + [AC_REQUIRE([OVS_CHECK_SPARSE_TARGET]) + 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 $(SPARSEFLAGS)" cgcc $(CGCCFLAGS),'"$CC"')'])])])