diff options
| author | Bernhard Walle <bernhard@bwalle.de> | 2012-07-26 21:47:30 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-07-27 08:40:46 +0200 |
| commit | 4578c3bdf184f8198fd5e62fccc1a8038b78f973 (patch) | |
| tree | adc58a903d8f8e7a6e1ecb3e755fce748b36fa34 | |
| parent | 0aca5af06c65d3e2f42525a6ac4d78b0857ae3bd (diff) | |
| download | ptxdist-4578c3bdf184f8198fd5e62fccc1a8038b78f973.tar.gz ptxdist-4578c3bdf184f8198fd5e62fccc1a8038b78f973.tar.xz | |
libpcre: Add option to enable libbz2 for pcregrep
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/libpcre.in | 5 | ||||
| -rw-r--r-- | rules/libpcre.make | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/rules/libpcre.in b/rules/libpcre.in index b6aab3c65..713d35d38 100644 --- a/rules/libpcre.in +++ b/rules/libpcre.in @@ -5,6 +5,8 @@ menuconfig LIBPCRE prompt "libpcre " select GCCLIBS_CXX if LIBPCRE_LIBPCRECPP select ZLIB if LIBPCRE_ENABLE_PCREGREP_LIBZ + select BZIP2 if LIBPCRE_ENABLE_PCREGREP_LIBBZ2 + select BZIP2_LIBBZ2 if LIBPCRE_ENABLE_PCREGREP_LIBBZ2 help Perl 5 Compatible Regular Expression Library @@ -20,6 +22,9 @@ config LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF config LIBPCRE_ENABLE_PCREGREP_LIBZ bool "Enable grep libz" +config LIBPCRE_ENABLE_PCREGREP_LIBBZ2 + bool "Enable grep libbz2" + config LIBPCRE_ENABLE_UTF8 bool "Enable UTF8" diff --git a/rules/libpcre.make b/rules/libpcre.make index 754654abd..8148b0f30 100644 --- a/rules/libpcre.make +++ b/rules/libpcre.make @@ -38,6 +38,7 @@ LIBPCRE_ENV := $(CROSS_ENV) LIBPCRE_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_PCREGREP_LIBZ)-pcregrep-libz \ + --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_PCREGREP_LIBBZ2)-pcregrep-libbz2 \ --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-utf8 ifdef PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF |