X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=m4%2Fopenvswitch.m4;h=e7281add1b240f20ef21c2e86acf86e0f435e27a;hb=a6b7506dab305d91fc5f2ac6416a714e5fa09dd4;hp=9d062a7dbae4c58a1ec9f8e4954b5e378d63ef03;hpb=361906b1e2c6482d77280f345d3e42048d8c2700;p=sliver-openvswitch.git diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 9d062a7db..e7281add1 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 ;; @@ -56,6 +56,16 @@ AC_DEFUN([OVS_CHECK_ESX], AC_DEFINE([ESX], [1], [Define to 1 if building on ESX.]) fi]) +dnl Checks for WINDOWS. +AC_DEFUN([OVS_CHECK_WIN32], + [AC_CHECK_HEADER([windows.h], + [WIN32=yes], + [WIN32=no]) + AM_CONDITIONAL([WIN32], [test "$WIN32" = yes]) + if test "$WIN32" = yes; then + AC_DEFINE([WIN32], [1], [Define to 1 if building on WIN32.]) + fi]) + dnl Checks for Netlink support. AC_DEFUN([OVS_CHECK_NETLINK], [AC_CHECK_HEADER([linux/netlink.h], @@ -83,8 +93,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 @@ -109,13 +118,13 @@ OpenFlow connections over SSL will not be supported. dnl Checks for libraries needed by lib/socket-util.c. AC_DEFUN([OVS_CHECK_SOCKET_LIBS], [AC_CHECK_LIB([socket], [connect]) - AC_SEARCH_LIBS([gethostbyname], [resolv], [RESOLVER_LIBS=-lresolv])]) + AC_SEARCH_LIBS([gethostbyname], [resolv])]) 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 +133,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 +144,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 +161,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 +175,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. @@ -195,7 +205,7 @@ AC_DEFUN([OVS_CHECK_PYTHON], for dir in $PATH; do IFS=$ovs_save_IFS test -z "$dir" && dir=. - if test -x $dir/$binary && $dir/$binary -c 'import sys + if test -x "$dir"/"$binary" && "$dir"/"$binary" -c 'import sys if sys.hexversion >= 0x02040000 and sys.hexversion < 0x03000000: sys.exit(0) else: @@ -286,6 +296,18 @@ AC_DEFUN([OVS_CHECK_OVSDBMONITOR], AC_MSG_RESULT([$BUILD_OVSDBMONITOR]) AM_CONDITIONAL([BUILD_OVSDBMONITOR], [test $BUILD_OVSDBMONITOR = yes])]) +dnl Checks for missing python modules at build time +AC_DEFUN([OVS_CHECK_PYTHON_COMPAT], + [OVS_CHECK_PYTHON_MODULE([uuid]) + if test $ovs_cv_py_uuid = yes; then + INCLUDE_PYTHON_COMPAT=no + else + INCLUDE_PYTHON_COMPAT=yes + fi + AC_MSG_CHECKING([whether to add python/compat to PYTHONPATH]) + AC_MSG_RESULT([$INCLUDE_PYTHON_COMPAT]) + AM_CONDITIONAL([INCLUDE_PYTHON_COMPAT], [test $INCLUDE_PYTHON_COMPAT = yes])]) + # OVS_LINK2_IFELSE(SOURCE1, SOURCE2, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) # ------------------------------------------------------------- # Based on AC_LINK_IFELSE, but tries to link both SOURCE1 and SOURCE2 @@ -375,22 +397,141 @@ 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_LIBS +dnl +dnl Check to see if -latomic is need for GCC atomic built-ins. +AC_DEFUN([OVS_CHECK_ATOMIC_LIBS], + [AC_SEARCH_LIBS([__atomic_load_8], [atomic])]) + +dnl OVS_CHECK_GCC4_ATOMICS +dnl +dnl Checks whether the compiler and linker support GCC 4.0+ atomic built-ins. +dnl A compile-time only check is not enough because the compiler defers +dnl unimplemented built-ins to libgcc, which sometimes also lacks +dnl implementations. +AC_DEFUN([OVS_CHECK_GCC4_ATOMICS], + [AC_CACHE_CHECK( + [whether $CC supports GCC 4.0+ atomic built-ins], + [ovs_cv_gcc4_atomics], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include + +#define ovs_assert(expr) if (!(expr)) abort(); +#define TEST_ATOMIC_TYPE(TYPE) \ + { \ + TYPE x = 1; \ + TYPE orig; \ + \ + __sync_synchronize(); \ + ovs_assert(x == 1); \ + \ + __sync_synchronize(); \ + x = 3; \ + __sync_synchronize(); \ + ovs_assert(x == 3); \ + \ + orig = __sync_fetch_and_add(&x, 1); \ + ovs_assert(orig == 3); \ + __sync_synchronize(); \ + ovs_assert(x == 4); \ + \ + orig = __sync_fetch_and_sub(&x, 2); \ + ovs_assert(orig == 4); \ + __sync_synchronize(); \ + ovs_assert(x == 2); \ + \ + orig = __sync_fetch_and_or(&x, 6); \ + ovs_assert(orig == 2); \ + __sync_synchronize(); \ + ovs_assert(x == 6); \ + \ + orig = __sync_fetch_and_and(&x, 10); \ + ovs_assert(orig == 6); \ + __sync_synchronize(); \ + ovs_assert(x == 2); \ + \ + orig = __sync_fetch_and_xor(&x, 10); \ + ovs_assert(orig == 2); \ + __sync_synchronize(); \ + ovs_assert(x == 8); \ + }]], [dnl +TEST_ATOMIC_TYPE(char); +TEST_ATOMIC_TYPE(unsigned char); +TEST_ATOMIC_TYPE(signed char); +TEST_ATOMIC_TYPE(short); +TEST_ATOMIC_TYPE(unsigned short); +TEST_ATOMIC_TYPE(int); +TEST_ATOMIC_TYPE(unsigned int); +TEST_ATOMIC_TYPE(long int); +TEST_ATOMIC_TYPE(unsigned long int); +TEST_ATOMIC_TYPE(long long int); +TEST_ATOMIC_TYPE(unsigned long long int); +])], + [ovs_cv_gcc4_atomics=yes], + [ovs_cv_gcc4_atomics=no])]) + if test $ovs_cv_gcc4_atomics = yes; then + AC_DEFINE([HAVE_GCC4_ATOMICS], [1], + [Define to 1 if the C compiler and linker supports the GCC 4.0+ + atomic built-ins.]) + 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])])