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

diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index affeac35..58e4b64e 100644
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -113,9 +113,10 @@ AC_DEFUN([OVS_CHECK_RUNDIR],
   [AC_ARG_WITH(
      [rundir], 
      AC_HELP_STRING([--with-rundir=DIR], 
-                    [directory used for pidfiles [[LOCALSTATEDIR/run]]]),
+                    [directory used for pidfiles
+                    [[LOCALSTATEDIR/run/openvswitch]]]),
      [RUNDIR=$withval],
-     [RUNDIR='${localstatedir}/run'])
+     [RUNDIR='${localstatedir}/run/openvswitch'])
    AC_SUBST([RUNDIR])])
 
 dnl Checks for the directory in which to store logs.
@@ -216,24 +217,18 @@ 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])
-   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])
+   PKG_CHECK_MODULES([PCRE],
+                     [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_PARTIAL])
+])
 
 dnl Checks for Python 2.x, x >= 4.
 AC_DEFUN([OVS_CHECK_PYTHON],