@matheusbsbs / matheus-bagliano / commits / 072473e659

Makefile & configure: reword inaccurate comment about PCRE

Reword an outdated & inaccurate comment which suggests that only git-grep can use PCRE. This comment was added back when PCRE support was initially added in commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09), and was true at the time. It hasn't been telling the full truth since git-log learned to use PCRE with --grep in commit 727b6fc3ed ("log --grep: accept --basic-regexp and --perl-regexp", 2012-10-03), and more importantly is likely to get more inaccurate over time as more use is made of PCRE in other areas. Reword it to be more future-proof, and to more clearly explain that this enables user-initiated runtime behavior. Copy/pasting this so much in configure.ac is lame, these Makefile-like flags aren't even used by autoconf, just the corresponding --with[out]-* options. But copy/pasting the comments that make sense for the Makefile to configure.ac where they make less sense is the pattern everything else follows in that file. I'm not going to war against that as part of this change, just following the existing pattern. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed May 20, 2017 at 21:42 UTC 072473e6593783a291a7bb5249086985268e6b9f

2 files changed +12 -6

Makefile

+4 -2

@@ -24,8 +24,10 @@ all::

24 # Define NO_OPENSSL environment variable if you do not have OpenSSL.

25 # This also implies BLK_SHA1.

26 #

27 -# Define USE_LIBPCRE if you have and want to use libpcre. git-grep will be

28 -# able to use Perl-compatible regular expressions.

27 +# Define USE_LIBPCRE if you have and want to use libpcre. Various

28 +# commands such as log and grep offer runtime options to use

29 +# Perl-compatible regular expressions instead of standard or extended

30 +# POSIX regular expressions.

31 #

32 # Define LIBPCREDIR=/foo/bar if your libpcre header and library files are in

33 # /foo/bar/include and /foo/bar/lib directories.

configure.ac

+8 -4

@@ -250,8 +250,10 @@ AS_HELP_STRING([--with-openssl],[use OpenSSL library (default is YES)])

250 AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),

251 GIT_PARSE_WITH([openssl]))

252

253 -# Define USE_LIBPCRE if you have and want to use libpcre. git-grep will be

254 -# able to use Perl-compatible regular expressions.

253 +# Define USE_LIBPCRE if you have and want to use libpcre. Various

254 +# commands such as log and grep offer runtime options to use

255 +# Perl-compatible regular expressions instead of standard or extended

256 +# POSIX regular expressions.

257 #

258 # Define LIBPCREDIR=/foo/bar if your libpcre header and library files are in

259 # /foo/bar/include and /foo/bar/lib directories.

@@ -499,8 +501,10 @@ GIT_CONF_SUBST([NEEDS_SSL_WITH_CRYPTO])

501 GIT_CONF_SUBST([NO_OPENSSL])

502

503 #

502 -# Define USE_LIBPCRE if you have and want to use libpcre. git-grep will be

503 -# able to use Perl-compatible regular expressions.

504 +# Define USE_LIBPCRE if you have and want to use libpcre. Various

505 +# commands such as log and grep offer runtime options to use

506 +# Perl-compatible regular expressions instead of standard or extended

507 +# POSIX regular expressions.

508 #

509

510 if test -n "$USE_LIBPCRE"; then