X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=acinclude.m4;h=02dc9525e264fe6faf166e1c638534966688934c;hb=ab0eef1120b7e59cc310befd731e08cb3f1d81f9;hp=648132a2a5b4bce308ad7a59a47d00d5acaf1fb3;hpb=f613a0d72c521ca3a4eeb2c29ac523f6fdf72667;p=sliver-openvswitch.git diff --git a/acinclude.m4 b/acinclude.m4 index 648132a2a..02dc9525e 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 @@ -137,7 +144,8 @@ AC_DEFUN([OVS_CHECK_LINUX], [ 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 "$KBUILD"/include/linux/version.h || \ + 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]) @@ -230,6 +238,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 +248,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])]) @@ -278,6 +289,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 @@ -384,7 +406,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], @@ -404,8 +426,28 @@ 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 @@ -429,8 +471,10 @@ AC_DEFUN([OVS_CHECK_SPARSE_TARGET], 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"')'])])]) + 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])])