diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-02-08 15:37:49 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-08 15:37:49 -0800 |
| commit | bfe8e67ad595348f228938663956c3b8325997c5 (patch) | |
| tree | 92280e0ad9fd035952d97ef6337fb8aa3fd936a0 /m4 | |
| parent | 0d0f05b909b6428d44eb147bd4edd73782d2a137 (diff) | |
ovsdb: Fix support for systems where libpcre is not installed.
This is one of the loose ends that I intended to fix up and test before
pushing off my commits to add use of PCRE, but obviously I forgot.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/openvswitch.m4 | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index affeac35..861e4ebd 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -224,16 +224,22 @@ 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]) - 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])]) + 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]) 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]) + fi + AC_SUBST([HAVE_PCRE]) + AC_SUBST([HAVE_PCRE_PARTIAL]) +]) dnl Checks for Python 2.x, x >= 4. AC_DEFUN([OVS_CHECK_PYTHON], |