X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=m4%2Fopenvswitch.m4;h=861e4ebd80df1ed0530a9231e20e91df944cd6a6;hb=b89d8339252cd330daca7341bbd76c7316080127;hp=affeac358e6f7bda60d275274752be35ae3f9e3c;hpb=bd76d25d8b3b7d11c5a326e91d784ad2cdeecd45;p=openvswitch

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],