diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-02-23 15:48:28 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-25 14:59:41 -0800 |
| commit | a26cc67c16932fa9d07da200bbff75889cfe7529 (patch) | |
| tree | 1d928d9895cef1230c131d24a301ec9d9b0f2874 /m4 | |
| parent | 89521e3f79d53523fda9f284e74f0f7aa21332b4 (diff) | |
Remove PCRE dependency.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/openvswitch.m4 | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 861e4ebd..ccb3a014 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -216,28 +216,16 @@ AC_DEFUN([OVS_CHECK_LINUX_VT_H], 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 >= 6.6], - [HAVE_PCRE=yes - PKG_CHECK_EXISTS([libpcre >= 7.2], - [HAVE_PCRE_PARTIAL=yes], - [HAVE_PCRE_PARTIAL=no])], - [HAVE_PCRE=no - HAVE_PCRE_PARTIAL=no]) - AM_CONDITIONAL([HAVE_PCRE], [test "$HAVE_PCRE" = yes]) + [libpcre >= 7.2], + [HAVE_PCRE_PARTIAL=yes], + [HAVE_PCRE_PARTIAL=no]) 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 - AC_SUBST([HAVE_PCRE]) AC_SUBST([HAVE_PCRE_PARTIAL]) ]) |