From: Michael Stapelberg Date: Tue, 27 Sep 2016 02:04:13 +0000 (-0700) Subject: Unconditionally depend on libpcre >= 8.10 (#2472) X-Git-Tag: 4.13~27 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c93056b2d892b094926d9536583201f0f90baea6;hp=f4f9b7102d9f19e7cf8f5d255c067cd332491676;p=i3%2Fi3 Unconditionally depend on libpcre >= 8.10 (#2472) Even Debian oldstable has 8.30, so let’s get rid of conditional compilation where we don’t actually need it. --- diff --git a/common.mk b/common.mk index 2bd879d4..7df415eb 100644 --- a/common.mk +++ b/common.mk @@ -135,8 +135,8 @@ LIBEV_LIBS := $(call ldflags_for_lib, libev,ev) # libpcre PCRE_CFLAGS := $(call cflags_for_lib, libpcre) -ifeq ($(shell $(PKG_CONFIG) --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1) -I3_CPPFLAGS += -DPCRE_HAS_UCP=1 +ifneq ($(shell $(PKG_CONFIG) --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1) +$(error "libpcre >= 8.10 not found") endif PCRE_LIBS := $(call ldflags_for_lib, libpcre,pcre) diff --git a/debian/control b/debian/control index 6b1530b8..c1e655d8 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9), pkg-config, libev-dev (>= 1:4.04), libyajl-dev (>= 2.0.4), - libpcre3-dev, + libpcre3-dev (>= 1:8.10), libstartup-notification0-dev (>= 0.10), libcairo2-dev, libpango1.0-dev, diff --git a/src/regex.c b/src/regex.c index 24846981..12c0b67f 100644 --- a/src/regex.c +++ b/src/regex.c @@ -28,11 +28,9 @@ struct regex *regex_new(const char *pattern) { struct regex *re = scalloc(1, sizeof(struct regex)); re->pattern = sstrdup(pattern); int options = PCRE_UTF8; -#ifdef PCRE_HAS_UCP /* We use PCRE_UCP so that \B, \b, \D, \d, \S, \s, \W, \w and some POSIX * character classes play nicely with Unicode */ options |= PCRE_UCP; -#endif while (!(re->regex = pcre_compile2(pattern, options, &errorcode, &error, &offset, NULL))) { /* If the error is that PCRE was not compiled with UTF-8 support we * disable it and try again */