X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=m4%2Fopenvswitch.m4;h=dbfc7c425c03638719acf809b13f3ad1f0f4b9e2;hb=6dc34a0dab88c90252c0c682380579c45b74428b;hp=9d062a7dbae4c58a1ec9f8e4954b5e378d63ef03;hpb=361906b1e2c6482d77280f345d3e42048d8c2700;p=sliver-openvswitch.git diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 9d062a7db..dbfc7c425 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -1,6 +1,6 @@ # -*- autoconf -*- -# Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. +# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ AC_DEFUN([OVS_CHECK_COVERAGE], [AC_REQUIRE([AC_PROG_CC]) AC_ARG_ENABLE( [coverage], - [AC_HELP_STRING([--enable-coverage], + [AC_HELP_STRING([--enable-coverage], [Enable gcov coverage tool.])], [case "${enableval}" in (yes) coverage=true ;; @@ -36,7 +36,7 @@ dnl Checks for --enable-ndebug and defines NDEBUG if it is specified. AC_DEFUN([OVS_CHECK_NDEBUG], [AC_ARG_ENABLE( [ndebug], - [AC_HELP_STRING([--enable-ndebug], + [AC_HELP_STRING([--enable-ndebug], [Disable debugging features for max performance])], [case "${enableval}" in (yes) ndebug=true ;; @@ -46,6 +46,22 @@ AC_DEFUN([OVS_CHECK_NDEBUG], [ndebug=false]) AM_CONDITIONAL([NDEBUG], [test x$ndebug = xtrue])]) +dnl Checks for --enable-cache-time and defines CACHE_TIME if it is specified. +AC_DEFUN([OVS_CHECK_CACHE_TIME], + [AC_ARG_ENABLE( + [cache-time], + [AC_HELP_STRING([--enable-cache-time], + [Override time caching default (for testing only)])], + [case "${enableval}" in + (yes) cache_time=1;; + (no) cache_time=0;; + (*) AC_MSG_ERROR([bad value ${enableval} for --enable-cache-time]) ;; + esac + AC_DEFINE_UNQUOTED([CACHE_TIME], [$cache_time], + [Define to 1 to enable time caching, to 0 to disable time caching, or + leave undefined to use the default (as one should + ordinarily do).])])]) + dnl Checks for ESX. AC_DEFUN([OVS_CHECK_ESX], [AC_CHECK_HEADER([vmware.h], @@ -83,8 +99,7 @@ AC_DEFUN([OVS_CHECK_OPENSSL], [ssl=check]) if test "$ssl" != false; then - m4_ifndef([PKG_CHECK_MODULES], [m4_fatal([Please install pkg-config.])]) - PKG_CHECK_MODULES([SSL], [openssl], + AX_CHECK_OPENSSL( [HAVE_OPENSSL=yes], [HAVE_OPENSSL=no if test "$ssl" = check; then @@ -114,8 +129,8 @@ AC_DEFUN([OVS_CHECK_SOCKET_LIBS], dnl Checks for the directory in which to store the PKI. AC_DEFUN([OVS_CHECK_PKIDIR], [AC_ARG_WITH( - [pkidir], - AC_HELP_STRING([--with-pkidir=DIR], + [pkidir], + AC_HELP_STRING([--with-pkidir=DIR], [PKI hierarchy directory [[LOCALSTATEDIR/lib/openvswitch/pki]]]), [PKIDIR=$withval], [PKIDIR='${localstatedir}/lib/openvswitch/pki']) @@ -124,8 +139,8 @@ AC_DEFUN([OVS_CHECK_PKIDIR], dnl Checks for the directory in which to store pidfiles. AC_DEFUN([OVS_CHECK_RUNDIR], [AC_ARG_WITH( - [rundir], - AC_HELP_STRING([--with-rundir=DIR], + [rundir], + AC_HELP_STRING([--with-rundir=DIR], [directory used for pidfiles [[LOCALSTATEDIR/run/openvswitch]]]), [RUNDIR=$withval], @@ -135,8 +150,8 @@ AC_DEFUN([OVS_CHECK_RUNDIR], dnl Checks for the directory in which to store logs. AC_DEFUN([OVS_CHECK_LOGDIR], [AC_ARG_WITH( - [logdir], - AC_HELP_STRING([--with-logdir=DIR], + [logdir], + AC_HELP_STRING([--with-logdir=DIR], [directory used for logs [[LOCALSTATEDIR/log/PACKAGE]]]), [LOGDIR=$withval], [LOGDIR='${localstatedir}/log/${PACKAGE}']) @@ -152,10 +167,11 @@ AC_DEFUN([OVS_CHECK_DBDIR], [DBDIR='${sysconfdir}/${PACKAGE}']) AC_SUBST([DBDIR])]) -dnl Defines HAVE_BACKTRACE if backtrace() is declared in -dnl and exists in libc. +dnl Defines HAVE_BACKTRACE if backtrace() is found. AC_DEFUN([OVS_CHECK_BACKTRACE], - [AC_CHECK_HEADER([execinfo.h], [AC_CHECK_FUNCS([backtrace])])]) + [AC_SEARCH_LIBS([backtrace], [execinfo ubacktrace], + [AC_DEFINE([HAVE_BACKTRACE], [1], + [Define to 1 if you have backtrace(3).])])]) dnl Checks for __malloc_hook, etc., supported by glibc. AC_DEFUN([OVS_CHECK_MALLOC_HOOKS], @@ -165,20 +181,20 @@ AC_DEFUN([OVS_CHECK_MALLOC_HOOKS], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [#include - ], + ], [(void) __malloc_hook; (void) __realloc_hook; (void) __free_hook;])], [ovs_cv_malloc_hooks=yes], [ovs_cv_malloc_hooks=no])]) if test $ovs_cv_malloc_hooks = yes; then - AC_DEFINE([HAVE_MALLOC_HOOKS], [1], + AC_DEFINE([HAVE_MALLOC_HOOKS], [1], [Define to 1 if you have __malloc_hook, __realloc_hook, and __free_hook in .]) fi]) dnl Checks for valgrind/valgrind.h. -AC_DEFUN([OVS_CHECK_VALGRIND], +AC_DEFUN([OVS_CHECK_VALGRIND], [AC_CHECK_HEADERS([valgrind/valgrind.h])]) dnl Checks for Python 2.x, x >= 4. @@ -375,22 +391,63 @@ AC_DEFUN([OVS_CHECK_GROFF], fi]) AM_CONDITIONAL([HAVE_GROFF], [test "$ovs_cv_groff" = yes])]) -dnl Checks for --disable-brcompat and undefines BUILD_BRCOMPAT if it is specified. -AC_DEFUN([OVS_CHECK_BRCOMPAT], - [AC_ARG_ENABLE( - [brcompat], - [AC_HELP_STRING([--disable-brcompat], - [Disable building brcompat])], - [case "${enableval}" in - (yes) brcompat=true ;; - (no) brcompat=false ;; - (*) AC_MSG_ERROR([bad value ${enableval} for --enable-brcompat]) ;; - esac], - [brcompat=true]) - if test x$brcompat = xtrue; then - BUILD_BRCOMPAT=yes +dnl Checks for thread-local storage support. +dnl +dnl Checks whether the compiler and linker support the C11 +dnl thread_local macro from , and if so defines +dnl HAVE_THREAD_LOCAL. If not, checks whether the compiler and linker +dnl support the GCC __thread extension, and if so defines +dnl HAVE___THREAD. +AC_DEFUN([OVS_CHECK_TLS], + [AC_CACHE_CHECK( + [whether $CC has that supports thread_local], + [ovs_cv_thread_local], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include +static thread_local int var;], [return var;])], + [ovs_cv_thread_local=yes], + [ovs_cv_thread_local=no])]) + if test $ovs_cv_thread_local = yes; then + AC_DEFINE([HAVE_THREAD_LOCAL], [1], + [Define to 1 if the C compiler and linker supports the C11 + thread_local matcro defined in .]) else - BUILD_BRCOMPAT="" - fi - AC_SUBST([BUILD_BRCOMPAT]) - AM_CONDITIONAL([BUILD_BRCOMPAT], [test x$brcompat = xtrue])]) + AC_CACHE_CHECK( + [whether $CC supports __thread], + [ovs_cv___thread], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM([static __thread int var;], [return var;])], + [ovs_cv___thread=yes], + [ovs_cv___thread=no])]) + if test $ovs_cv___thread = yes; then + AC_DEFINE([HAVE___THREAD], [1], + [Define to 1 if the C compiler and linker supports the + GCC __thread extenions.]) + fi + fi]) + +dnl OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(SIZE) +dnl +dnl Checks __atomic_always_lock_free(SIZE, 0) +AC_DEFUN([OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE], + [AC_CACHE_CHECK( + [value of __atomic_always_lock_free($1)], + [ovs_cv_atomic_always_lock_free_$1], + [AC_COMPUTE_INT( + [ovs_cv_atomic_always_lock_free_$1], + [__atomic_always_lock_free($1, 0)], + [], + [ovs_cv_atomic_always_lock_free_$1=unsupported])]) + if test ovs_cv_atomic_always_lock_free_$1 != unsupported; then + AC_DEFINE_UNQUOTED( + [ATOMIC_ALWAYS_LOCK_FREE_$1B], + [$ovs_cv_atomic_always_lock_free_$1], + [If the C compiler is GCC 4.7 or later, define to the return value of + __atomic_always_lock_free($1, 0). If the C compiler is not GCC or is + an older version of GCC, the value does not matter.]) + fi]) + +dnl OVS_CHECK_POSIX_AIO +AC_DEFUN([OVS_CHECK_POSIX_AIO], + [AC_SEARCH_LIBS([aio_write], [rt]) + AM_CONDITIONAL([HAVE_POSIX_AIO], [test "$ac_cv_search_aio_write" != no])])