X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=d502b000d4b56001f02c37c9e376a27e71e444fa;hb=refs%2Fheads%2Fmanual;hp=fc7155f7b2918a31132c2dcf3f2ccabe854b3751;hpb=53319f95b9d3d025917110e2688a2cf0616f7071;p=openvswitch diff --git a/acinclude.m4 b/acinclude.m4 index fc7155f7..d502b000 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 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -98,16 +98,23 @@ AC_DEFUN([OVS_CHECK_LINUX], [ else KSRC=$KBUILD if test ! -e $KSRC/include/linux/kernel.h; then - case `echo "$KBUILD" | sed 's,/*$,,'` in # ( - */build) - KSRC=`echo "$KBUILD" | sed 's,/build/*$,/source,'` - ;; # ( - *) - KSRC=`(cd $KBUILD && pwd -P) | sed 's,-[[^-]]*$,-common,'` - ;; - esac + # 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 + if test ! -e "$KSRC"/include/linux/kernel.h; then AC_MSG_ERROR([cannot find source directory (please use --with-linux-source)]) fi fi @@ -180,7 +187,7 @@ 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], [ @@ -198,9 +205,9 @@ dnl dnl Runs various Autoconf checks on the Linux 2.6 kernel source in dnl the directory in $KBUILD. AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ - rm -f datapath/linux-2.6/kcompat.h.new - mkdir -p datapath/linux-2.6 - : > datapath/linux-2.6/kcompat.h.new + 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])]) @@ -230,6 +237,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [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])]) @@ -238,6 +247,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ 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/skbuff.h], [skb_frag_page]) OVS_GREP_IFELSE([$KSRC/include/linux/string.h], [kmemdup], [], [OVS_GREP_IFELSE([$KSRC/include/linux/slab.h], [kmemdup])]) @@ -254,18 +264,16 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ 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_link.h], [rtnl_link_stats64]) - OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [ADD_ALL_VLANS_CMD], [OVS_DEFINE([HAVE_VLAN_BUG_WORKAROUND])]) 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 ]) @@ -280,6 +288,17 @@ AC_DEFUN([OVS_CHECK_IF_PACKET], [Define to 1 if net/if_packet.h is available.]) fi]) +dnl Checks for net/if_dl.h. +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.]) + fi]) + dnl Checks for buggy strtok_r. dnl dnl Some versions of glibc 2.7 has a bug in strtok_r when compiling @@ -386,7 +405,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], @@ -406,13 +425,55 @@ 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_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]) + : ${SPARSE=sparse} + AC_SUBST([SPARSE]) + AC_CONFIG_COMMANDS_PRE( + [if test $ovs_cv_gnu_make_if = yes; then + CC='$(if $(C),REAL_CC="'"$CC"'" CHECK="$(SPARSE) -I $(top_srcdir)/include/sparse $(SPARSEFLAGS)" cgcc $(CGCCFLAGS),'"$CC"')' + fi])])