X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fopenvswitch.m4;h=12c02c08e47b02273f46a45591a5f324485d08b5;hb=825da1c6d1c7b9bc5128d7588b8bad6efaae650e;hp=dca9f5fe716f8111b4f6dc0c8c809746fa68b0c0;hpb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;p=sliver-openvswitch.git diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index dca9f5fe7..12c02c08e 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -19,10 +19,10 @@ 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 - (lcov|yes) coverage=true ;; + (yes) coverage=true ;; (no) coverage=false ;; (*) AC_MSG_ERROR([bad value ${enableval} for --enable-coverage]) ;; esac], @@ -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,32 @@ 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], + [ESX=yes], + [ESX=no]) + AM_CONDITIONAL([ESX], [test "$ESX" = yes]) + if test "$ESX" = yes; then + AC_DEFINE([ESX], [1], [Define to 1 if building on ESX.]) + fi]) + dnl Checks for Netlink support. AC_DEFUN([OVS_CHECK_NETLINK], [AC_CHECK_HEADER([linux/netlink.h], @@ -73,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 @@ -104,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']) @@ -114,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], @@ -125,17 +150,28 @@ 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}']) AC_SUBST([LOGDIR])]) -dnl Defines HAVE_BACKTRACE if backtrace() is declared in -dnl and exists in libc. +dnl Checks for the directory in which to store the Open vSwitch database. +AC_DEFUN([OVS_CHECK_DBDIR], + [AC_ARG_WITH( + [dbdir], + AC_HELP_STRING([--with-dbdir=DIR], + [directory used for conf.db [[SYSCONFDIR/PACKAGE]]]), + [DBDIR=$withval], + [DBDIR='${sysconfdir}/${PACKAGE}']) + AC_SUBST([DBDIR])]) + +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], @@ -145,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. @@ -354,23 +390,3 @@ AC_DEFUN([OVS_CHECK_GROFF], ovs_cv_groff=no 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 - else - BUILD_BRCOMPAT="" - fi - AC_SUBST([BUILD_BRCOMPAT]) - AM_CONDITIONAL([BUILD_BRCOMPAT], [test x$brcompat = xtrue])])