[ovs-dev] [PATCH 3/3] Remove PCRE dependency.
Jesse Gross
jesse at nicira.com
Wed Feb 24 23:22:50 UTC 2010
This whole set looks fine.
On Tue, Feb 23, 2010 at 7:08 PM, Ben Pfaff <blp at nicira.com> wrote:
> ---
> INSTALL.Linux | 7 -------
> m4/openvswitch.m4 | 18 +++---------------
> ovsdb/automake.mk | 6 +++---
> tests/atlocal.in | 1 -
> tests/automake.mk | 2 +-
> utilities/automake.mk | 2 +-
> vswitchd/automake.mk | 5 ++---
> 7 files changed, 10 insertions(+), 31 deletions(-)
>
> diff --git a/INSTALL.Linux b/INSTALL.Linux
> index 6529118..c0344f2 100644
> --- a/INSTALL.Linux
> +++ b/INSTALL.Linux
> @@ -27,10 +27,6 @@ you will need the following software:
> connections from an Open vSwitch to an OpenFlow controller. To
> enable, configure with --enable-ssl=yes.
>
> - - libpcre, the Perl Compatible Regular Expression library, is
> - optional but recommended. Without it, OVSDB will not be able to
> - validate regular-expression based contraints.
> -
> To compile the kernel module, you must also install the following. If
> you cannot build or install the kernel module, you may use the
> userspace-only implementation, at a cost in performance. The
> @@ -84,9 +80,6 @@ following software:
> - libssl compatible with the libssl used for build, if OpenSSL was
> used for the build.
>
> - - libpcre compatible with the libpcre used for build, if PCRE was
> - used for the build.
> -
> - The Linux kernel version configured as part of the build.
>
> - For optional support of ingress policing, the "tc" program from
> diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
> index 861e4eb..ccb3a01 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])
> ])
>
> diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
> index 1e05e9f..8605410 100644
> --- a/ovsdb/automake.mk
> +++ b/ovsdb/automake.mk
> @@ -34,7 +34,7 @@ EXTRA_DIST += \
> # ovsdb-tool
> bin_PROGRAMS += ovsdb/ovsdb-tool
> ovsdb_ovsdb_tool_SOURCES = ovsdb/ovsdb-tool.c
> -ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
> $(PCRE_LIBS)
> +ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
> # ovsdb-tool.1
> man_MANS += ovsdb/ovsdb-tool.1
> DISTCLEANFILES += ovsdb/ovsdb-tool.1
> @@ -43,7 +43,7 @@ EXTRA_DIST += ovsdb/ovsdb-tool.1.in
> # ovsdb-client
> bin_PROGRAMS += ovsdb/ovsdb-client
> ovsdb_ovsdb_client_SOURCES = ovsdb/ovsdb-client.c
> -ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
> $(SSL_LIBS) $(PCRE_LIBS)
> +ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
> $(SSL_LIBS)
> # ovsdb-client.1
> man_MANS += ovsdb/ovsdb-client.1
> DISTCLEANFILES += ovsdb/ovsdb-client.1
> @@ -52,7 +52,7 @@ EXTRA_DIST += ovsdb/ovsdb-client.1.in
> # ovsdb-server
> sbin_PROGRAMS += ovsdb/ovsdb-server
> ovsdb_ovsdb_server_SOURCES = ovsdb/ovsdb-server.c
> -ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
> $(SSL_LIBS) $(PCRE_LIBS)
> +ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
> $(SSL_LIBS)
> # ovsdb-server.1
> man_MANS += ovsdb/ovsdb-server.1
> DISTCLEANFILES += ovsdb/ovsdb-server.1
> diff --git a/tests/atlocal.in b/tests/atlocal.in
> index 1628ea5..8ac4f67 100644
> --- a/tests/atlocal.in
> +++ b/tests/atlocal.in
> @@ -1,6 +1,5 @@
> # -*- shell-script -*-
> HAVE_OPENSSL='@HAVE_OPENSSL@'
> -HAVE_PCRE='@HAVE_PCRE@'
> HAVE_PYTHON='@HAVE_PYTHON@'
> PERL='@PERL@'
> PYTHON='@PYTHON@'
> diff --git a/tests/automake.mk b/tests/automake.mk
> index e5cd0ec..d6f6783 100644
> --- a/tests/automake.mk
> +++ b/tests/automake.mk
> @@ -216,7 +216,7 @@ tests_test_ovsdb_SOURCES = \
> tests/idltest.c \
> tests/idltest.h
> EXTRA_DIST += tests/uuidfilt.pl
> -tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
> $(PCRE_LIBS)
> +tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
>
> # idltest schema and IDL
> OVSIDL_BUILT += tests/idltest.c tests/idltest.h
> tests/idltest.ovsidl
> diff --git a/utilities/automake.mk b/utilities/automake.mk
> index b849231..5feb01c 100644
> --- a/utilities/automake.mk
> +++ b/utilities/automake.mk
> @@ -77,7 +77,7 @@ utilities_ovs_openflowd_LDADD = \
> $(SSL_LIBS)
>
> utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c vswitchd/vswitch-idl.c
> -utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS) $(PCRE_LIBS)
> +utilities_ovs_vsctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
>
> utilities_ovs_wdt_SOURCES = utilities/ovs-wdt.c
>
> diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
> index d5f9056..c38add6 100644
> --- a/vswitchd/automake.mk
> +++ b/vswitchd/automake.mk
> @@ -20,15 +20,14 @@ vswitchd_ovs_vswitchd_LDADD = \
> ofproto/libofproto.a \
> lib/libsflow.a \
> lib/libopenvswitch.a \
> - $(SSL_LIBS) \
> - $(PCRE_LIBS)
> + $(SSL_LIBS)
>
> vswitchd_ovs_brcompatd_SOURCES = \
> vswitchd/ovs-brcompatd.c \
> vswitchd/vswitch-idl.c \
> vswitchd/vswitch-idl.h
>
> -vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
> $(PCRE_LIBS)
> +vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
>
> EXTRA_DIST += \
> vswitchd/ovs-vswitchd.8.in \
> --
> 1.6.6.1
>
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openvswitch.org/pipermail/ovs-dev/attachments/20100224/a71ed950/attachment-0003.html>
More information about the dev
mailing list