git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Always use generic stats for devices (vports)
[sliver-openvswitch.git]
/
m4
/
openvswitch.m4
diff --git
a/m4/openvswitch.m4
b/m4/openvswitch.m4
index
077c29b
..
c59d5d4
100644
(file)
--- a/
m4/openvswitch.m4
+++ b/
m4/openvswitch.m4
@@
-1,6
+1,6
@@
# -*- autoconf -*-
# -*- autoconf -*-
-# Copyright (c) 2008, 2009, 2010 Nicira Networks.
+# Copyright (c) 2008, 2009, 2010
, 2011
Nicira Networks.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-73,8
+73,7
@@
AC_DEFUN([OVS_CHECK_OPENSSL],
[ssl=check])
if test "$ssl" != false; then
[ssl=check])
if test "$ssl" != false; then
- dnl Make sure that pkg-config is installed.
- m4_pattern_forbid([PKG_CHECK_MODULES])
+ m4_ifndef([PKG_CHECK_MODULES], [m4_fatal([Please install pkg-config.])])
PKG_CHECK_MODULES([SSL], [openssl],
[HAVE_OPENSSL=yes],
[HAVE_OPENSSL=no
PKG_CHECK_MODULES([SSL], [openssl],
[HAVE_OPENSSL=yes],
[HAVE_OPENSSL=no
@@
-133,6
+132,11
@@
AC_DEFUN([OVS_CHECK_LOGDIR],
[LOGDIR='${localstatedir}/log/${PACKAGE}'])
AC_SUBST([LOGDIR])])
[LOGDIR='${localstatedir}/log/${PACKAGE}'])
AC_SUBST([LOGDIR])])
+dnl Defines HAVE_BACKTRACE if backtrace() is declared in <execinfo.h>
+dnl and exists in libc.
+AC_DEFUN([OVS_CHECK_BACKTRACE],
+ [AC_CHECK_HEADER([execinfo.h], [AC_CHECK_FUNCS([backtrace])])])
+
dnl Checks for __malloc_hook, etc., supported by glibc.
AC_DEFUN([OVS_CHECK_MALLOC_HOOKS],
[AC_CACHE_CHECK(
dnl Checks for __malloc_hook, etc., supported by glibc.
AC_DEFUN([OVS_CHECK_MALLOC_HOOKS],
[AC_CACHE_CHECK(
@@
-338,3
+342,15
@@
AC_DEFUN([OVS_CHECK_LINKER_SECTIONS],
fi
AM_CONDITIONAL(
[USE_LINKER_SECTIONS], [test $ovs_cv_use_linker_sections = yes])])
fi
AM_CONDITIONAL(
[USE_LINKER_SECTIONS], [test $ovs_cv_use_linker_sections = yes])])
+
+dnl Checks for groff.
+AC_DEFUN([OVS_CHECK_GROFF],
+ [AC_CACHE_CHECK(
+ [for groff],
+ [ovs_cv_groff],
+ [if (groff -v) >/dev/null 2>&1; then
+ ovs_cv_groff=yes
+ else
+ ovs_cv_groff=no
+ fi])
+ AM_CONDITIONAL([HAVE_GROFF], [test "$ovs_cv_groff" = yes])])