diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-02-08 14:09:36 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-08 14:16:19 -0800 |
| commit | bd76d25d8b3b7d11c5a326e91d784ad2cdeecd45 (patch) | |
| tree | 688e7370f9794e3c4189c38ff38a59937c9016e1 /m4 | |
| parent | 629cd2f17fedf8d922f61ffd13365d1f4f9b34fe (diff) | |
ovsdb: Add simple constraints.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/openvswitch.m4 | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 7b827e70..affeac35 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -215,11 +215,22 @@ AC_DEFUN([OVS_CHECK_LINUX_VT_H], fi]) dnl Checks for libpcre. +dnl +dnl ovsdb wants any reasonable version of libpcre (6.6 is what +dnl XenServer 5.5 has). +dnl +dnl ezio-term wants libpcre that supports the PCRE_PARTIAL feature, +dnl which is libpcre 7.2 or later. AC_DEFUN([OVS_CHECK_PCRE], [dnl Make sure that pkg-config is installed. m4_pattern_forbid([PKG_CHECK_MODULES]) - PKG_CHECK_MODULES([PCRE], [libpcre >= 7.2], [HAVE_PCRE=yes], [HAVE_PCRE=no]) + HAVE_PCRE=no + HAVE_PCRE_PARTIAL=no + PKG_CHECK_MODULES([PCRE], [libpcre >= 6.6], + [HAVE_PCRE=yes + PKG_CHECK_EXISTS([libpcre >= 7.2], [HAVE_PCRE_PARTIAL=yes])]) AM_CONDITIONAL([HAVE_PCRE], [test "$HAVE_PCRE" = yes]) + AM_CONDITIONAL([HAVE_PCRE_PARTIAL], [test "$HAVE_PCRE_PARTIAL" = yes]) if test "$HAVE_PCRE" = yes; then AC_DEFINE([HAVE_PCRE], [1], [Define to 1 if libpcre is installed.]) fi]) |