From: Ben Pfaff Date: Thu, 6 Aug 2009 20:24:13 +0000 (-0700) Subject: switch UI: Only build ovs-switchui if PCRE 7.2 or later is available. X-Git-Tag: v0.99.0~133^2~4 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=081f1381725f2f091119eb2e12991a6e86246260 switch UI: Only build ovs-switchui if PCRE 7.2 or later is available. The PCRE_INFO_OKPARTIAL feature used by ovs-switchui was only introduced in PCRE 7.2, so we need to check for that version or later, instead of just for PCRE. Thanks to Ian Campbell for reporting the problem. --- diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 3fe053b06..d65baba8c 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -228,7 +228,7 @@ dnl Checks for libpcre. AC_DEFUN([OVS_CHECK_PCRE], [dnl Make sure that pkg-config is installed. m4_pattern_forbid([PKG_CHECK_MODULES]) - PKG_CHECK_MODULES([PCRE], [libpcre], [HAVE_PCRE=yes], [HAVE_PCRE=no]) + PKG_CHECK_MODULES([PCRE], [libpcre >= 7.2], [HAVE_PCRE=yes], [HAVE_PCRE=no]) AM_CONDITIONAL([HAVE_PCRE], [test "$HAVE_PCRE" = yes]) if test "$HAVE_PCRE" = yes; then AC_DEFINE([HAVE_PCRE], [1], [Define to 1 if libpcre is installed.])