2006-07-02 23:56:48 +00:00
|
|
|
# -*- Autoconf -*-
|
|
|
|
# Process this file with autoconf to produce a configure script.
|
|
|
|
|
2012-03-26 16:42:26 +00:00
|
|
|
## Definitions of private macros.
|
|
|
|
|
2012-07-19 07:49:57 +00:00
|
|
|
# GIT_CONF_SUBST(VAL, VAR)
|
|
|
|
# ------------------------
|
2012-07-19 07:50:00 +00:00
|
|
|
# Cause the line "VAR=VAL" to be eventually appended to ${config_file}.
|
|
|
|
AC_DEFUN([GIT_CONF_SUBST],
|
2012-09-11 15:45:29 +00:00
|
|
|
[AC_REQUIRE([GIT_CONF_SUBST_INIT])
|
|
|
|
config_appended_defs="$config_appended_defs${newline}dnl
|
|
|
|
$1=m4_if([$#],[1],[${$1}],[$2])"])
|
2012-07-19 07:50:00 +00:00
|
|
|
|
|
|
|
# GIT_CONF_SUBST_INIT
|
|
|
|
# -------------------
|
|
|
|
# Prepare shell variables and autoconf machine required by later calls
|
|
|
|
# to GIT_CONF_SUBST.
|
|
|
|
AC_DEFUN([GIT_CONF_SUBST_INIT],
|
|
|
|
[config_appended_defs=; newline='
|
|
|
|
'
|
|
|
|
AC_CONFIG_COMMANDS([$config_file],
|
|
|
|
[echo "$config_appended_defs" >> "$config_file"],
|
|
|
|
[config_file=$config_file
|
|
|
|
config_appended_defs="$config_appended_defs"])])
|
2012-03-26 16:42:26 +00:00
|
|
|
|
2006-08-02 22:38:11 +00:00
|
|
|
# GIT_ARG_SET_PATH(PROGRAM)
|
|
|
|
# -------------------------
|
|
|
|
# Provide --with-PROGRAM=PATH option to set PATH to PROGRAM
|
2010-02-01 02:15:04 +00:00
|
|
|
# Optional second argument allows setting NO_PROGRAM=YesPlease if
|
|
|
|
# --without-PROGRAM version used.
|
2006-08-02 22:38:11 +00:00
|
|
|
AC_DEFUN([GIT_ARG_SET_PATH],
|
2012-03-26 16:42:26 +00:00
|
|
|
[AC_ARG_WITH([$1],
|
|
|
|
[AS_HELP_STRING([--with-$1=PATH],
|
|
|
|
[provide PATH to $1])],
|
|
|
|
[GIT_CONF_APPEND_PATH([$1], [$2])],
|
|
|
|
[])])
|
|
|
|
|
2006-08-02 22:38:11 +00:00
|
|
|
# GIT_CONF_APPEND_PATH(PROGRAM)
|
2012-03-26 16:42:26 +00:00
|
|
|
# -----------------------------
|
2006-08-02 22:38:11 +00:00
|
|
|
# Parse --with-PROGRAM=PATH option to set PROGRAM_PATH=PATH
|
|
|
|
# Used by GIT_ARG_SET_PATH(PROGRAM)
|
2010-02-01 02:15:04 +00:00
|
|
|
# Optional second argument allows setting NO_PROGRAM=YesPlease if
|
|
|
|
# --without-PROGRAM is used.
|
2006-08-02 22:38:11 +00:00
|
|
|
AC_DEFUN([GIT_CONF_APPEND_PATH],
|
2012-03-26 16:42:26 +00:00
|
|
|
[m4_pushdef([GIT_UC_PROGRAM], m4_toupper([$1]))dnl
|
|
|
|
if test "$withval" = "no"; then
|
|
|
|
if test -n "$2"; then
|
|
|
|
GIT_UC_PROGRAM[]_PATH=$withval
|
2012-07-19 07:49:58 +00:00
|
|
|
AC_MSG_NOTICE([Disabling use of GIT_UC_PROGRAM])
|
|
|
|
GIT_CONF_SUBST([NO_]GIT_UC_PROGRAM, [YesPlease])
|
|
|
|
GIT_CONF_SUBST(GIT_UC_PROGRAM[]_PATH, [])
|
2012-03-26 16:42:26 +00:00
|
|
|
else
|
|
|
|
AC_MSG_ERROR([You cannot use git without $1])
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
if test "$withval" = "yes"; then
|
|
|
|
AC_MSG_WARN([You should provide path for --with-$1=PATH])
|
|
|
|
else
|
|
|
|
GIT_UC_PROGRAM[]_PATH=$withval
|
|
|
|
AC_MSG_NOTICE([Setting GIT_UC_PROGRAM[]_PATH to $withval])
|
2012-07-19 07:49:58 +00:00
|
|
|
GIT_CONF_SUBST(GIT_UC_PROGRAM[]_PATH, [$withval])
|
2012-03-26 16:42:26 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
m4_popdef([GIT_UC_PROGRAM])])
|
|
|
|
|
2006-08-09 00:15:10 +00:00
|
|
|
# GIT_PARSE_WITH(PACKAGE)
|
|
|
|
# -----------------------
|
|
|
|
# For use in AC_ARG_WITH action-if-found, for packages default ON.
|
|
|
|
# * Set NO_PACKAGE=YesPlease for --without-PACKAGE
|
|
|
|
# * Set PACKAGEDIR=PATH for --with-PACKAGE=PATH
|
|
|
|
# * Unset NO_PACKAGE for --with-PACKAGE without ARG
|
|
|
|
AC_DEFUN([GIT_PARSE_WITH],
|
2012-03-26 16:42:26 +00:00
|
|
|
[m4_pushdef([GIT_UC_PACKAGE], m4_toupper([$1]))dnl
|
|
|
|
if test "$withval" = "no"; then
|
|
|
|
NO_[]GIT_UC_PACKAGE=YesPlease
|
|
|
|
elif test "$withval" = "yes"; then
|
|
|
|
NO_[]GIT_UC_PACKAGE=
|
|
|
|
else
|
|
|
|
NO_[]GIT_UC_PACKAGE=
|
|
|
|
GIT_UC_PACKAGE[]DIR=$withval
|
|
|
|
AC_MSG_NOTICE([Setting GIT_UC_PACKAGE[]DIR to $withval])
|
2012-07-19 07:49:58 +00:00
|
|
|
GIT_CONF_SUBST(GIT_UC_PACKAGE[DIR], [$withval])
|
2012-03-26 16:42:26 +00:00
|
|
|
fi
|
|
|
|
m4_popdef([GIT_UC_PACKAGE])])
|
|
|
|
|
2009-11-04 18:05:59 +00:00
|
|
|
# GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT)
|
2012-03-26 16:42:26 +00:00
|
|
|
# -----------------------------------------------------
|
2019-11-05 17:07:23 +00:00
|
|
|
# Set VAR to the value specified by --with-WITHNAME.
|
2009-11-04 18:05:59 +00:00
|
|
|
# No verification of arguments is performed, but warnings are issued
|
|
|
|
# if either 'yes' or 'no' is specified.
|
|
|
|
# HELP_TEXT is presented when --help is called.
|
|
|
|
# This is a direct way to allow setting variables in the Makefile.
|
|
|
|
AC_DEFUN([GIT_PARSE_WITH_SET_MAKE_VAR],
|
|
|
|
[AC_ARG_WITH([$1],
|
|
|
|
[AS_HELP_STRING([--with-$1=VALUE], $3)],
|
2012-03-26 16:42:26 +00:00
|
|
|
if test -n "$withval"; then
|
|
|
|
if test "$withval" = "yes" -o "$withval" = "no"; then
|
2009-11-04 18:05:59 +00:00
|
|
|
AC_MSG_WARN([You likely do not want either 'yes' or 'no' as]
|
2012-03-26 16:42:26 +00:00
|
|
|
[a value for $1 ($2). Maybe you do...?])
|
|
|
|
fi
|
|
|
|
AC_MSG_NOTICE([Setting $2 to $withval])
|
2012-07-19 07:49:57 +00:00
|
|
|
GIT_CONF_SUBST([$2], [$withval])
|
2009-11-04 18:05:59 +00:00
|
|
|
fi)])# GIT_PARSE_WITH_SET_MAKE_VAR
|
2006-07-08 21:07:09 +00:00
|
|
|
|
2012-03-26 16:42:26 +00:00
|
|
|
#
|
|
|
|
# GIT_CHECK_FUNC(FUNCTION, IFTRUE, IFFALSE)
|
|
|
|
# -----------------------------------------
|
|
|
|
# Similar to AC_CHECK_FUNC, but on systems that do not generate
|
|
|
|
# warnings for missing prototypes (e.g. FreeBSD when compiling without
|
|
|
|
# -Wall), it does not work. By looking for function definition in
|
|
|
|
# libraries, this problem can be worked around.
|
2008-10-26 11:52:19 +00:00
|
|
|
AC_DEFUN([GIT_CHECK_FUNC],[AC_CHECK_FUNC([$1],[
|
|
|
|
AC_SEARCH_LIBS([$1],,
|
|
|
|
[$2],[$3])
|
|
|
|
],[$3])])
|
2009-03-12 19:20:08 +00:00
|
|
|
|
2012-03-26 16:42:26 +00:00
|
|
|
#
|
|
|
|
# GIT_STASH_FLAGS(BASEPATH_VAR)
|
|
|
|
# -----------------------------
|
|
|
|
# Allow for easy stashing of LDFLAGS and CPPFLAGS before running
|
|
|
|
# tests that may want to take user settings into account.
|
2009-03-12 19:20:08 +00:00
|
|
|
AC_DEFUN([GIT_STASH_FLAGS],[
|
|
|
|
if test -n "$1"; then
|
|
|
|
old_CPPFLAGS="$CPPFLAGS"
|
|
|
|
old_LDFLAGS="$LDFLAGS"
|
|
|
|
CPPFLAGS="-I$1/include $CPPFLAGS"
|
|
|
|
LDFLAGS="-L$1/$lib $LDFLAGS"
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl GIT_UNSTASH_FLAGS(BASEPATH_VAR)
|
|
|
|
dnl -----------------------------
|
|
|
|
dnl Restore the stashed *FLAGS values.
|
|
|
|
AC_DEFUN([GIT_UNSTASH_FLAGS],[
|
|
|
|
if test -n "$1"; then
|
|
|
|
CPPFLAGS="$old_CPPFLAGS"
|
|
|
|
LDFLAGS="$old_LDFLAGS"
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
2012-03-26 16:42:24 +00:00
|
|
|
## Configure body starts here.
|
|
|
|
|
|
|
|
AC_PREREQ(2.59)
|
|
|
|
AC_INIT([git], [@@GIT_VERSION@@], [git@vger.kernel.org])
|
|
|
|
|
|
|
|
AC_CONFIG_SRCDIR([git.c])
|
|
|
|
|
|
|
|
config_file=config.mak.autogen
|
|
|
|
config_in=config.mak.in
|
|
|
|
|
2012-07-19 07:50:02 +00:00
|
|
|
GIT_CONF_SUBST([AUTOCONFIGURED], [YesPlease])
|
|
|
|
|
2012-03-09 12:43:55 +00:00
|
|
|
# Directories holding "saner" versions of common or POSIX binaries.
|
|
|
|
AC_ARG_WITH([sane-tool-path],
|
|
|
|
[AS_HELP_STRING(
|
|
|
|
[--with-sane-tool-path=DIR-1[[:DIR-2...:DIR-n]]],
|
|
|
|
[Directories to prepend to PATH in build system and generated scripts])],
|
|
|
|
[if test "$withval" = "no"; then
|
|
|
|
withval=''
|
|
|
|
else
|
|
|
|
AC_MSG_NOTICE([Setting SANE_TOOL_PATH to '$withval'])
|
|
|
|
fi
|
2012-07-19 07:49:57 +00:00
|
|
|
GIT_CONF_SUBST([SANE_TOOL_PATH], [$withval])],
|
2012-03-09 12:43:55 +00:00
|
|
|
[# If the "--with-sane-tool-path" option was not given, don't touch
|
|
|
|
# SANE_TOOL_PATH here, but let defaults in Makefile take care of it.
|
|
|
|
# This should minimize spurious differences in the behaviour of the
|
|
|
|
# Git build system when configure is used w.r.t. when it is not.
|
|
|
|
:])
|
|
|
|
|
2006-08-09 00:15:10 +00:00
|
|
|
## Site configuration related to programs (before tests)
|
2006-08-02 22:38:56 +00:00
|
|
|
## --with-PACKAGE[=ARG] and --without-PACKAGE
|
|
|
|
#
|
2007-08-01 04:30:35 +00:00
|
|
|
# Set lib to alternative name of lib directory (e.g. lib64)
|
|
|
|
AC_ARG_WITH([lib],
|
|
|
|
[AS_HELP_STRING([--with-lib=ARG],
|
|
|
|
[ARG specifies alternative name for lib directory])],
|
2012-03-26 16:42:26 +00:00
|
|
|
[if test "$withval" = "no" || test "$withval" = "yes"; then
|
|
|
|
AC_MSG_WARN([You should provide name for --with-lib=ARG])
|
|
|
|
else
|
|
|
|
lib=$withval
|
|
|
|
AC_MSG_NOTICE([Setting lib to '$lib'])
|
2012-09-11 15:45:29 +00:00
|
|
|
GIT_CONF_SUBST([lib])
|
2012-03-26 16:42:26 +00:00
|
|
|
fi])
|
2009-03-12 19:20:06 +00:00
|
|
|
|
|
|
|
if test -z "$lib"; then
|
|
|
|
AC_MSG_NOTICE([Setting lib to 'lib' (the default)])
|
|
|
|
lib=lib
|
|
|
|
fi
|
2009-03-12 19:20:07 +00:00
|
|
|
|
2009-03-12 19:20:12 +00:00
|
|
|
AC_ARG_ENABLE([pthreads],
|
|
|
|
[AS_HELP_STRING([--enable-pthreads=FLAGS],
|
|
|
|
[FLAGS is the value to pass to the compiler to enable POSIX Threads.]
|
|
|
|
[The default if FLAGS is not specified is to try first -pthread]
|
|
|
|
[and then -lpthread.]
|
2013-06-28 17:19:42 +00:00
|
|
|
[--disable-pthreads will disable threading.])],
|
2009-03-12 19:20:12 +00:00
|
|
|
[
|
|
|
|
if test "x$enableval" = "xyes"; then
|
|
|
|
AC_MSG_NOTICE([Will try -pthread then -lpthread to enable POSIX Threads])
|
|
|
|
elif test "x$enableval" != "xno"; then
|
|
|
|
PTHREAD_CFLAGS=$enableval
|
|
|
|
AC_MSG_NOTICE([Setting '$PTHREAD_CFLAGS' as the FLAGS to enable POSIX Threads])
|
|
|
|
else
|
|
|
|
AC_MSG_NOTICE([POSIX Threads will be disabled.])
|
|
|
|
NO_PTHREADS=YesPlease
|
|
|
|
USER_NOPTHREAD=1
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_NOTICE([Will try -pthread then -lpthread to enable POSIX Threads.])
|
|
|
|
])
|
|
|
|
|
2010-04-03 00:35:54 +00:00
|
|
|
# Define option to enable JavaScript minification
|
|
|
|
AC_ARG_ENABLE([jsmin],
|
|
|
|
[AS_HELP_STRING([--enable-jsmin=PATH],
|
|
|
|
[PATH is the name of a JavaScript minifier or the absolute path to one.])],
|
|
|
|
[
|
|
|
|
JSMIN=$enableval;
|
|
|
|
AC_MSG_NOTICE([Setting JSMIN to '$JSMIN' to enable JavaScript minifying])
|
2012-09-11 15:45:29 +00:00
|
|
|
GIT_CONF_SUBST([JSMIN])
|
2010-04-03 00:35:54 +00:00
|
|
|
])
|
|
|
|
|
|
|
|
# Define option to enable CSS minification
|
|
|
|
AC_ARG_ENABLE([cssmin],
|
|
|
|
[AS_HELP_STRING([--enable-cssmin=PATH],
|
|
|
|
[PATH is the name of a CSS minifier or the absolute path to one.])],
|
|
|
|
[
|
|
|
|
CSSMIN=$enableval;
|
|
|
|
AC_MSG_NOTICE([Setting CSSMIN to '$CSSMIN' to enable CSS minifying])
|
2012-09-11 15:45:29 +00:00
|
|
|
GIT_CONF_SUBST([CSSMIN])
|
2010-04-03 00:35:54 +00:00
|
|
|
])
|
|
|
|
|
2009-03-12 19:20:07 +00:00
|
|
|
## Site configuration (override autodetection)
|
|
|
|
## --with-PACKAGE[=ARG] and --without-PACKAGE
|
|
|
|
AC_MSG_NOTICE([CHECKS for site configuration])
|
|
|
|
#
|
|
|
|
# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
|
|
|
|
# tests. These tests take up a significant amount of the total test time
|
|
|
|
# but are not needed unless you plan to talk to SVN repos.
|
|
|
|
#
|
|
|
|
# Define PPC_SHA1 environment variable when running make to make use of
|
|
|
|
# a bundled SHA1 routine optimized for PowerPC.
|
|
|
|
#
|
|
|
|
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
|
|
|
#
|
|
|
|
# Define OPENSSLDIR=/foo/bar if your openssl header and library files are in
|
|
|
|
# /foo/bar/include and /foo/bar/lib directories.
|
|
|
|
AC_ARG_WITH(openssl,
|
|
|
|
AS_HELP_STRING([--with-openssl],[use OpenSSL library (default is YES)])
|
2012-03-26 16:42:26 +00:00
|
|
|
AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),
|
|
|
|
GIT_PARSE_WITH([openssl]))
|
|
|
|
|
2017-05-20 21:42:04 +00:00
|
|
|
# Define USE_LIBPCRE if you have and want to use libpcre. Various
|
|
|
|
# commands such as log and grep offer runtime options to use
|
|
|
|
# Perl-compatible regular expressions instead of standard or extended
|
2021-01-24 01:58:33 +00:00
|
|
|
# POSIX regular expressions. Only libpcre version 2 is supported.
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
#
|
|
|
|
# Define LIBPCREDIR=/foo/bar if your PCRE header and library files are in
|
2011-05-09 21:52:06 +00:00
|
|
|
# /foo/bar/include and /foo/bar/lib directories.
|
|
|
|
#
|
2021-01-24 01:58:33 +00:00
|
|
|
|
|
|
|
AC_ARG_WITH(libpcre1,
|
|
|
|
AS_HELP_STRING([--with-libpcre1],[DEPRECATED]),
|
|
|
|
AC_MSG_ERROR([support for --with-libpcre1 has been removed. Use --with-libpcre2!])
|
|
|
|
)
|
|
|
|
|
2011-05-09 21:52:06 +00:00
|
|
|
AC_ARG_WITH(libpcre,
|
2018-03-11 13:26:09 +00:00
|
|
|
AS_HELP_STRING([--with-libpcre],[synonym for --with-libpcre2]),
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
if test "$withval" = "no"; then
|
2018-03-11 13:26:09 +00:00
|
|
|
USE_LIBPCRE2=
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
elif test "$withval" = "yes"; then
|
2018-03-11 13:26:09 +00:00
|
|
|
USE_LIBPCRE2=YesPlease
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
else
|
2018-03-11 13:26:09 +00:00
|
|
|
USE_LIBPCRE2=YesPlease
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
LIBPCREDIR=$withval
|
|
|
|
AC_MSG_NOTICE([Setting LIBPCREDIR to $LIBPCREDIR])
|
2018-03-11 13:26:09 +00:00
|
|
|
dnl USE_LIBPCRE2 can still be modified below, so don't substitute
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
dnl it yet.
|
|
|
|
GIT_CONF_SUBST([LIBPCREDIR])
|
|
|
|
fi)
|
|
|
|
|
|
|
|
AC_ARG_WITH(libpcre2,
|
|
|
|
AS_HELP_STRING([--with-libpcre2],[support Perl-compatible regexes via libpcre2 (default is NO)])
|
2011-05-09 21:52:06 +00:00
|
|
|
AS_HELP_STRING([], [ARG can be also prefix for libpcre library and headers]),
|
2018-03-11 13:26:09 +00:00
|
|
|
if test -n "$USE_LIBPCRE2"; then
|
|
|
|
AC_MSG_ERROR([Only supply one of --with-libpcre or its synonym --with-libpcre2!])
|
|
|
|
fi
|
|
|
|
|
2012-03-26 16:42:26 +00:00
|
|
|
if test "$withval" = "no"; then
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
USE_LIBPCRE2=
|
2012-03-26 16:42:26 +00:00
|
|
|
elif test "$withval" = "yes"; then
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
USE_LIBPCRE2=YesPlease
|
2012-03-26 16:42:26 +00:00
|
|
|
else
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
USE_LIBPCRE2=YesPlease
|
2012-03-26 16:42:26 +00:00
|
|
|
LIBPCREDIR=$withval
|
2012-09-11 15:45:29 +00:00
|
|
|
AC_MSG_NOTICE([Setting LIBPCREDIR to $LIBPCREDIR])
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
dnl USE_LIBPCRE2 can still be modified below, so don't substitute
|
2012-09-11 15:45:30 +00:00
|
|
|
dnl it yet.
|
2012-09-11 15:45:29 +00:00
|
|
|
GIT_CONF_SUBST([LIBPCREDIR])
|
2012-03-26 16:42:26 +00:00
|
|
|
fi)
|
2011-05-09 21:52:06 +00:00
|
|
|
#
|
Portable alloca for Git
In the next patch we'll have to use alloca() for performance reasons,
but since alloca is non-standardized and is not portable, let's have a
trick with compatibility wrappers:
1. at configure time, determine, do we have working alloca() through
alloca.h, and define
#define HAVE_ALLOCA_H
if yes.
2. in code
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
# define xalloca(size) (alloca(size))
# define xalloca_free(p) do {} while(0)
#else
# define xalloca(size) (xmalloc(size))
# define xalloca_free(p) (free(p))
#endif
and use it like
func() {
p = xalloca(size);
...
xalloca_free(p);
}
This way, for systems, where alloca is available, we'll have optimal
on-stack allocations with fast executions. On the other hand, on
systems, where alloca is not available, this gracefully fallbacks to
xmalloc/free.
Both autoconf and config.mak.uname configurations were updated. For
autoconf, we are not bothering considering cases, when no alloca.h is
available, but alloca() works some other way - its simply alloca.h is
available and works or not, everything else is deep legacy.
For config.mak.uname, I've tried to make my almost-sure guess for where
alloca() is available, but since I only have access to Linux it is the
only change I can be sure about myself, with relevant to other changed
systems people Cc'ed.
NOTE
SunOS and Windows had explicit -DHAVE_ALLOCA_H in their configurations.
I've changed that to now-common HAVE_ALLOCA_H=YesPlease which should be
correct.
Cc: Brandon Casey <drafnel@gmail.com>
Cc: Marius Storm-Olsen <mstormo@gmail.com>
Cc: Johannes Sixt <j6t@kdbg.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Cc: Gerrit Pape <pape@smarden.org>
Cc: Petr Salinger <Petr.Salinger@seznam.cz>
Cc: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Thomas Schwinge <thomas@codesourcery.com> (GNU Hurd changes)
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-27 14:22:50 +00:00
|
|
|
# Define HAVE_ALLOCA_H if you have working alloca(3) defined in that header.
|
|
|
|
AC_FUNC_ALLOCA
|
|
|
|
case $ac_cv_working_alloca_h in
|
|
|
|
yes) HAVE_ALLOCA_H=YesPlease;;
|
|
|
|
*) HAVE_ALLOCA_H='';;
|
|
|
|
esac
|
|
|
|
GIT_CONF_SUBST([HAVE_ALLOCA_H])
|
|
|
|
#
|
2009-03-12 19:20:07 +00:00
|
|
|
# Define NO_CURL if you do not have curl installed. git-http-pull and
|
|
|
|
# git-http-push are not built, and you cannot use http:// and https://
|
|
|
|
# transports.
|
|
|
|
#
|
|
|
|
# Define CURLDIR=/foo/bar if your curl header and library files are in
|
|
|
|
# /foo/bar/include and /foo/bar/lib directories.
|
|
|
|
AC_ARG_WITH(curl,
|
|
|
|
AS_HELP_STRING([--with-curl],[support http(s):// transports (default is YES)])
|
|
|
|
AS_HELP_STRING([], [ARG can be also prefix for curl library and headers]),
|
|
|
|
GIT_PARSE_WITH(curl))
|
|
|
|
#
|
|
|
|
# Define NO_EXPAT if you do not have expat installed. git-http-push is
|
|
|
|
# not built, and you cannot push using http:// and https:// transports.
|
|
|
|
#
|
|
|
|
# Define EXPATDIR=/foo/bar if your expat header and library files are in
|
|
|
|
# /foo/bar/include and /foo/bar/lib directories.
|
|
|
|
AC_ARG_WITH(expat,
|
|
|
|
AS_HELP_STRING([--with-expat],
|
|
|
|
[support git-push using http:// and https:// transports via WebDAV (default is YES)])
|
|
|
|
AS_HELP_STRING([], [ARG can be also prefix for expat library and headers]),
|
|
|
|
GIT_PARSE_WITH(expat))
|
|
|
|
#
|
|
|
|
# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink
|
|
|
|
# installed in /sw, but don't want GIT to link against any libraries
|
|
|
|
# installed there. If defined you may specify your own (or Fink's)
|
|
|
|
# include directories and library directories by defining CFLAGS
|
|
|
|
# and LDFLAGS appropriately.
|
|
|
|
#
|
|
|
|
# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X,
|
|
|
|
# have DarwinPorts installed in /opt/local, but don't want GIT to
|
|
|
|
# link against any libraries installed there. If defined you may
|
|
|
|
# specify your own (or DarwinPort's) include directories and
|
|
|
|
# library directories by defining CFLAGS and LDFLAGS appropriately.
|
|
|
|
#
|
|
|
|
# Define NO_MMAP if you want to avoid mmap.
|
|
|
|
#
|
|
|
|
# Define NO_ICONV if your libc does not properly support iconv.
|
|
|
|
AC_ARG_WITH(iconv,
|
|
|
|
AS_HELP_STRING([--without-iconv],
|
|
|
|
[if your architecture doesn't properly support iconv])
|
|
|
|
AS_HELP_STRING([--with-iconv=PATH],
|
|
|
|
[PATH is prefix for libiconv library and headers])
|
|
|
|
AS_HELP_STRING([],
|
|
|
|
[used only if you need linking with libiconv]),
|
|
|
|
GIT_PARSE_WITH(iconv))
|
|
|
|
|
|
|
|
## --enable-FEATURE[=ARG] and --disable-FEATURE
|
|
|
|
#
|
|
|
|
# Define USE_NSEC below if you want git to care about sub-second file mtimes
|
|
|
|
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
|
|
|
|
# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
|
|
|
|
# randomly break unless your underlying filesystem supports those sub-second
|
|
|
|
# times (my ext3 doesn't).
|
|
|
|
#
|
|
|
|
# Define USE_STDEV below if you want git to care about the underlying device
|
|
|
|
# change being considered an inode change from the update-index perspective.
|
|
|
|
|
2009-11-04 18:06:00 +00:00
|
|
|
#
|
|
|
|
# Allow user to set ETC_GITCONFIG variable
|
|
|
|
GIT_PARSE_WITH_SET_MAKE_VAR(gitconfig, ETC_GITCONFIG,
|
|
|
|
Use VALUE instead of /etc/gitconfig as the
|
|
|
|
global git configuration file.
|
2010-08-31 22:42:43 +00:00
|
|
|
If VALUE is not fully qualified it will be interpreted
|
|
|
|
as a path relative to the computed prefix at runtime.)
|
|
|
|
|
|
|
|
#
|
|
|
|
# Allow user to set ETC_GITATTRIBUTES variable
|
|
|
|
GIT_PARSE_WITH_SET_MAKE_VAR(gitattributes, ETC_GITATTRIBUTES,
|
|
|
|
Use VALUE instead of /etc/gitattributes as the
|
|
|
|
global git attributes file.
|
|
|
|
If VALUE is not fully qualified it will be interpreted
|
2009-11-04 18:06:00 +00:00
|
|
|
as a path relative to the computed prefix at runtime.)
|
|
|
|
|
|
|
|
#
|
|
|
|
# Allow user to set the default pager
|
|
|
|
GIT_PARSE_WITH_SET_MAKE_VAR(pager, DEFAULT_PAGER,
|
|
|
|
Use VALUE as the fall-back pager instead of 'less'.
|
|
|
|
This is used by things like 'git log' when the user
|
|
|
|
does not specify a pager to use through alternate
|
|
|
|
methods. eg: /usr/bin/pager)
|
|
|
|
#
|
|
|
|
# Allow user to set the default editor
|
|
|
|
GIT_PARSE_WITH_SET_MAKE_VAR(editor, DEFAULT_EDITOR,
|
|
|
|
Use VALUE as the fall-back editor instead of 'vi'.
|
|
|
|
This is used by things like 'git commit' when the user
|
|
|
|
does not specify a preferred editor through other
|
|
|
|
methods. eg: /usr/bin/editor)
|
|
|
|
|
2007-08-01 04:30:35 +00:00
|
|
|
#
|
2006-08-04 15:55:58 +00:00
|
|
|
# Define SHELL_PATH to provide path to shell.
|
|
|
|
GIT_ARG_SET_PATH(shell)
|
|
|
|
#
|
|
|
|
# Define PERL_PATH to provide path to Perl.
|
|
|
|
GIT_ARG_SET_PATH(perl)
|
|
|
|
#
|
2009-11-18 01:42:31 +00:00
|
|
|
# Define PYTHON_PATH to provide path to Python.
|
2010-02-01 02:15:05 +00:00
|
|
|
GIT_ARG_SET_PATH(python, allow-without)
|
2009-11-18 01:42:31 +00:00
|
|
|
#
|
2007-07-29 18:35:45 +00:00
|
|
|
# Define ZLIB_PATH to provide path to zlib.
|
|
|
|
GIT_ARG_SET_PATH(zlib)
|
|
|
|
#
|
2007-03-28 11:12:07 +00:00
|
|
|
# Declare the with-tcltk/without-tcltk options.
|
|
|
|
AC_ARG_WITH(tcltk,
|
|
|
|
AS_HELP_STRING([--with-tcltk],[use Tcl/Tk GUI (default is YES)])
|
|
|
|
AS_HELP_STRING([],[ARG is the full path to the Tcl/Tk interpreter.])
|
|
|
|
AS_HELP_STRING([],[Bare --with-tcltk will make the GUI part only if])
|
2012-03-26 16:42:26 +00:00
|
|
|
AS_HELP_STRING([],[Tcl/Tk interpreter will be found in a system.]),
|
2007-03-28 11:12:07 +00:00
|
|
|
GIT_PARSE_WITH(tcltk))
|
|
|
|
#
|
2006-08-02 22:38:56 +00:00
|
|
|
|
|
|
|
|
2006-07-08 21:07:08 +00:00
|
|
|
## Checks for programs.
|
2006-07-08 21:07:13 +00:00
|
|
|
AC_MSG_NOTICE([CHECKS for programs])
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2006-08-15 09:01:31 +00:00
|
|
|
AC_PROG_CC([cc gcc])
|
2010-05-14 09:31:43 +00:00
|
|
|
AC_C_INLINE
|
|
|
|
case $ac_cv_c_inline in
|
2012-09-11 15:45:30 +00:00
|
|
|
inline | yes | no) INLINE='';;
|
|
|
|
*) INLINE=$ac_cv_c_inline ;;
|
2010-05-14 09:31:43 +00:00
|
|
|
esac
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([INLINE])
|
2010-05-14 09:31:43 +00:00
|
|
|
|
2008-08-16 13:01:23 +00:00
|
|
|
# which switch to pass runtime path to dynamic libraries to the linker
|
2009-01-19 20:34:36 +00:00
|
|
|
AC_CACHE_CHECK([if linker supports -R], git_cv_ld_dashr, [
|
2008-08-16 13:01:23 +00:00
|
|
|
SAVE_LDFLAGS="${LDFLAGS}"
|
|
|
|
LDFLAGS="${SAVE_LDFLAGS} -R /"
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no])
|
2008-08-16 13:01:23 +00:00
|
|
|
LDFLAGS="${SAVE_LDFLAGS}"
|
|
|
|
])
|
2009-01-19 20:34:36 +00:00
|
|
|
if test "$git_cv_ld_dashr" = "yes"; then
|
2012-09-11 15:45:30 +00:00
|
|
|
CC_LD_DYNPATH=-R
|
2008-08-16 13:01:23 +00:00
|
|
|
else
|
2009-01-19 20:34:36 +00:00
|
|
|
AC_CACHE_CHECK([if linker supports -Wl,-rpath,], git_cv_ld_wl_rpath, [
|
2008-08-16 13:01:23 +00:00
|
|
|
SAVE_LDFLAGS="${LDFLAGS}"
|
|
|
|
LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/"
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_wl_rpath=yes], [git_cv_ld_wl_rpath=no])
|
2009-01-05 02:27:41 +00:00
|
|
|
LDFLAGS="${SAVE_LDFLAGS}"
|
2008-08-16 13:01:23 +00:00
|
|
|
])
|
2009-01-19 20:34:36 +00:00
|
|
|
if test "$git_cv_ld_wl_rpath" = "yes"; then
|
2012-10-09 14:26:11 +00:00
|
|
|
CC_LD_DYNPATH=-Wl,-rpath,
|
2008-08-16 13:01:23 +00:00
|
|
|
else
|
2009-01-19 20:34:36 +00:00
|
|
|
AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [
|
2008-08-16 13:01:23 +00:00
|
|
|
SAVE_LDFLAGS="${LDFLAGS}"
|
|
|
|
LDFLAGS="${SAVE_LDFLAGS} -rpath /"
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_rpath=yes], [git_cv_ld_rpath=no])
|
2009-01-05 02:27:41 +00:00
|
|
|
LDFLAGS="${SAVE_LDFLAGS}"
|
2008-08-16 13:01:23 +00:00
|
|
|
])
|
2009-01-19 20:34:36 +00:00
|
|
|
if test "$git_cv_ld_rpath" = "yes"; then
|
2012-09-11 15:45:30 +00:00
|
|
|
CC_LD_DYNPATH=-rpath
|
2008-08-16 13:01:23 +00:00
|
|
|
else
|
2019-05-16 09:34:12 +00:00
|
|
|
AC_CACHE_CHECK([if linker supports -Wl,+b,], git_cv_ld_wl_b, [
|
|
|
|
SAVE_LDFLAGS="${LDFLAGS}"
|
|
|
|
LDFLAGS="${SAVE_LDFLAGS} -Wl,+b,/"
|
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_wl_b=yes], [git_cv_ld_wl_b=no])
|
|
|
|
LDFLAGS="${SAVE_LDFLAGS}"
|
|
|
|
])
|
|
|
|
if test "$git_cv_ld_wl_b" = "yes"; then
|
|
|
|
CC_LD_DYNPATH=-Wl,+b,
|
|
|
|
else
|
|
|
|
CC_LD_DYNPATH=
|
|
|
|
AC_MSG_WARN([linker does not support runtime path to dynamic libraries])
|
|
|
|
fi
|
2008-08-16 13:01:23 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([CC_LD_DYNPATH])
|
2006-07-08 21:07:13 +00:00
|
|
|
#AC_PROG_INSTALL # needs install-sh or install.sh in sources
|
2007-10-03 01:49:34 +00:00
|
|
|
AC_CHECK_TOOLS(AR, [gar ar], :)
|
2006-07-08 21:07:13 +00:00
|
|
|
AC_CHECK_PROGS(TAR, [gtar tar])
|
2010-05-14 09:31:36 +00:00
|
|
|
AC_CHECK_PROGS(DIFF, [gnudiff gdiff diff])
|
2007-03-28 11:12:07 +00:00
|
|
|
# TCLTK_PATH will be set to some value if we want Tcl/Tk
|
|
|
|
# or will be empty otherwise.
|
2012-09-11 15:45:30 +00:00
|
|
|
if test -n "$NO_TCLTK"; then
|
|
|
|
TCLTK_PATH=
|
|
|
|
else
|
2007-03-28 11:12:07 +00:00
|
|
|
if test "$with_tcltk" = ""; then
|
|
|
|
# No Tcl/Tk switches given. Do not check for Tcl/Tk, use bare 'wish'.
|
|
|
|
TCLTK_PATH=wish
|
|
|
|
elif test "$with_tcltk" = "yes"; then
|
|
|
|
# Tcl/Tk check requested.
|
|
|
|
AC_CHECK_PROGS(TCLTK_PATH, [wish], )
|
2007-03-29 10:06:48 +00:00
|
|
|
else
|
2007-03-28 11:12:07 +00:00
|
|
|
AC_MSG_RESULT([Using Tcl/Tk interpreter $with_tcltk])
|
|
|
|
TCLTK_PATH="$with_tcltk"
|
|
|
|
fi
|
|
|
|
fi
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([TCLTK_PATH])
|
2007-12-09 12:57:39 +00:00
|
|
|
AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
|
|
|
|
if test -n "$ASCIIDOC"; then
|
|
|
|
AC_MSG_CHECKING([for asciidoc version])
|
2009-03-12 19:20:10 +00:00
|
|
|
asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
|
2007-12-09 12:57:39 +00:00
|
|
|
case "${asciidoc_version}" in
|
2010-11-19 17:54:24 +00:00
|
|
|
asciidoc' '8*)
|
2007-12-09 12:57:39 +00:00
|
|
|
AC_MSG_RESULT([${asciidoc_version}])
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
AC_MSG_RESULT([${asciidoc_version} (unknown)])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
2016-03-08 23:47:57 +00:00
|
|
|
if grep -a ascii configure.ac >/dev/null; then
|
|
|
|
AC_MSG_RESULT([Using 'grep -a' for sane_grep])
|
|
|
|
SANE_TEXT_GREP=-a
|
|
|
|
else
|
|
|
|
SANE_TEXT_GREP=
|
|
|
|
fi
|
|
|
|
GIT_CONF_SUBST([SANE_TEXT_GREP])
|
2006-07-08 21:07:08 +00:00
|
|
|
|
|
|
|
## Checks for libraries.
|
2006-07-08 21:07:12 +00:00
|
|
|
AC_MSG_NOTICE([CHECKS for libraries])
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2006-07-08 21:07:08 +00:00
|
|
|
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
2006-07-08 21:07:12 +00:00
|
|
|
# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
|
2009-03-12 19:20:09 +00:00
|
|
|
|
|
|
|
GIT_STASH_FLAGS($OPENSSLDIR)
|
|
|
|
|
2006-08-04 21:43:59 +00:00
|
|
|
AC_CHECK_LIB([crypto], [SHA1_Init],
|
2006-08-08 16:39:06 +00:00
|
|
|
[NEEDS_SSL_WITH_CRYPTO=],
|
2006-08-04 23:33:18 +00:00
|
|
|
[AC_CHECK_LIB([ssl], [SHA1_Init],
|
2012-09-11 15:45:30 +00:00
|
|
|
[NEEDS_SSL_WITH_CRYPTO=YesPlease NO_OPENSSL=],
|
|
|
|
[NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease])])
|
2009-03-12 19:20:09 +00:00
|
|
|
|
|
|
|
GIT_UNSTASH_FLAGS($OPENSSLDIR)
|
|
|
|
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NEEDS_SSL_WITH_CRYPTO])
|
|
|
|
GIT_CONF_SUBST([NO_OPENSSL])
|
2009-03-12 19:20:09 +00:00
|
|
|
|
2011-05-09 21:52:06 +00:00
|
|
|
#
|
2021-01-24 01:58:33 +00:00
|
|
|
# Handle the USE_LIBPCRE options potentially set above.
|
2011-05-09 21:52:06 +00:00
|
|
|
#
|
|
|
|
|
grep: add support for PCRE v2
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
sense, as opposed to trying to e.g. have one compile_pcre_pattern()
that would call either PCRE v1 or v2 functions.
Git can now be compiled with either USE_LIBPCRE1=YesPlease or
USE_LIBPCRE2=YesPlease, with USE_LIBPCRE=YesPlease currently being a
synonym for the former. Providing both is a compile-time error.
With earlier patches to enable JIT for PCRE v1 the performance of the
release versions of both libraries is almost exactly the same, with
PCRE v2 being around 1% slower.
However after I reported this to the pcre-dev mailing list[2] I got a
lot of help with the API use from Zoltán Herczeg, he subsequently
optimized some of the JIT functionality in v2 of the library.
Running the p7820-grep-engines.sh performance test against the latest
Subversion trunk of both, with both them and git compiled as -O3, and
the test run against linux.git, gives the following results. Just the
/perl/ tests shown:
$ GIT_PERF_REPEAT_COUNT=30 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_MAKE_COMMAND='grep -q LIBPCRE2 Makefile && make -j8 USE_LIBPCRE2=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre2/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre2/inst/lib || make -j8 USE_LIBPCRE=YesPlease CC=~/perl5/installed/bin/gcc NO_R_TO_GCC_LINKER=YesPlease CFLAGS=-O3 LIBPCREDIR=/home/avar/g/pcre/inst LDFLAGS=-Wl,-rpath,/home/avar/g/pcre/inst/lib' ./run HEAD~5 HEAD~ HEAD p7820-grep-engines.sh
[...]
Test HEAD~5 HEAD~ HEAD
-----------------------------------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.31(1.10+0.48) 0.21(0.35+0.56) -32.3% 0.21(0.34+0.55) -32.3%
7820.7: perl grep '^how to' 0.56(2.70+0.40) 0.24(0.64+0.52) -57.1% 0.20(0.28+0.60) -64.3%
7820.11: perl grep '[how] to' 0.56(2.66+0.38) 0.29(0.95+0.45) -48.2% 0.23(0.45+0.54) -58.9%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 1.02(5.77+0.42) 0.31(1.02+0.54) -69.6% 0.23(0.50+0.54) -77.5%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.38(1.57+0.42) 0.27(0.85+0.46) -28.9% 0.21(0.33+0.57) -44.7%
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Here HEAD~2 is git with PCRE v1 without JIT, HEAD~ is PCRE v1 with
JIT, and HEAD is PCRE v2 (also with JIT). See previous commits of mine
mentioning p7820-grep-engines.sh for more details on the test setup.
For ease of readability, a different run just of HEAD~ (PCRE v1 with
JIT v.s. PCRE v2), again with just the /perl/ tests shown:
[...]
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
7820.3: perl grep 'how.to' 0.21(0.42+0.52) 0.21(0.31+0.58) +0.0%
7820.7: perl grep '^how to' 0.25(0.65+0.50) 0.20(0.31+0.57) -20.0%
7820.11: perl grep '[how] to' 0.30(0.90+0.50) 0.23(0.46+0.53) -23.3%
7820.15: perl grep '(e.t[^ ]*|v.ry) rare' 0.30(1.19+0.38) 0.23(0.51+0.51) -23.3%
7820.19: perl grep 'm(ú|u)lt.b(æ|y)te' 0.27(0.84+0.48) 0.21(0.34+0.57) -22.2%
I.e. the two are either neck-to-neck, but PCRE v2 usually pulls ahead,
when it does it's around 20% faster.
A brief note on thread safety: As noted in pcre2api(3) & pcre2jit(3)
the compiled pattern can be shared between threads, but not some of
the JIT context, however the grep threading support does all pattern &
JIT compilation in separate threads, so this code doesn't need to
concern itself with thread safety.
See commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) for the
initial addition of PCRE v1. This change follows some of the same
patterns it did (and which were discussed on list at the time),
e.g. mocking up types with typedef instead of ifdef-ing them out when
USE_LIBPCRE2 isn't defined. This adds some trivial memory use to the
program, but makes the code look nicer.
1. https://lists.exim.org/lurker/message/20150105.162835.0666407a.en.html
2. https://lists.exim.org/lurker/thread/20170419.172322.833ee099.en.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-01 18:20:56 +00:00
|
|
|
if test -n "$USE_LIBPCRE2"; then
|
|
|
|
|
|
|
|
GIT_STASH_FLAGS($LIBPCREDIR)
|
|
|
|
|
|
|
|
AC_CHECK_LIB([pcre2-8], [pcre2_config_8],
|
|
|
|
[USE_LIBPCRE2=YesPlease],
|
|
|
|
[USE_LIBPCRE2=])
|
|
|
|
|
|
|
|
GIT_UNSTASH_FLAGS($LIBPCREDIR)
|
|
|
|
|
|
|
|
GIT_CONF_SUBST([USE_LIBPCRE2])
|
2011-05-09 21:52:06 +00:00
|
|
|
|
|
|
|
fi
|
|
|
|
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2008-06-15 10:14:12 +00:00
|
|
|
# Define NO_CURL if you do not have libcurl installed. git-http-pull and
|
2006-07-08 21:07:08 +00:00
|
|
|
# git-http-push are not built, and you cannot use http:// and https://
|
|
|
|
# transports.
|
2009-03-12 19:20:09 +00:00
|
|
|
|
|
|
|
GIT_STASH_FLAGS($CURLDIR)
|
|
|
|
|
2006-08-04 21:43:59 +00:00
|
|
|
AC_CHECK_LIB([curl], [curl_global_init],
|
2006-08-08 16:39:06 +00:00
|
|
|
[NO_CURL=],
|
|
|
|
[NO_CURL=YesPlease])
|
2009-03-12 19:20:09 +00:00
|
|
|
|
|
|
|
GIT_UNSTASH_FLAGS($CURLDIR)
|
|
|
|
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_CURL])
|
2009-03-12 19:20:09 +00:00
|
|
|
|
2015-10-21 17:10:46 +00:00
|
|
|
if test -z "$NO_CURL"; then
|
|
|
|
|
|
|
|
AC_CHECK_PROG([CURL_CONFIG], [curl-config],
|
|
|
|
[curl-config],
|
|
|
|
[no])
|
|
|
|
|
|
|
|
if test $CURL_CONFIG != no; then
|
|
|
|
GIT_CONF_SUBST([CURL_CONFIG])
|
2018-11-03 05:12:11 +00:00
|
|
|
|
|
|
|
if test -z "$CURL_CONFIG_OPTS"; then
|
|
|
|
CURL_CONFIG_OPTS="--libs"
|
2016-06-28 12:04:34 +00:00
|
|
|
fi
|
2018-11-03 05:12:11 +00:00
|
|
|
|
|
|
|
CURL_LDFLAGS=$($CURL_CONFIG $CURL_CONFIG_OPTS)
|
|
|
|
AC_MSG_NOTICE([Setting CURL_LDFLAGS to '$CURL_LDFLAGS'])
|
|
|
|
GIT_CONF_SUBST([CURL_LDFLAGS], [$CURL_LDFLAGS])
|
2015-10-21 17:10:46 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2006-07-08 21:07:08 +00:00
|
|
|
# Define NO_EXPAT if you do not have expat installed. git-http-push is
|
|
|
|
# not built, and you cannot push using http:// and https:// transports.
|
2009-03-12 19:20:09 +00:00
|
|
|
|
|
|
|
GIT_STASH_FLAGS($EXPATDIR)
|
|
|
|
|
2006-08-04 21:43:59 +00:00
|
|
|
AC_CHECK_LIB([expat], [XML_ParserCreate],
|
2006-08-08 16:39:06 +00:00
|
|
|
[NO_EXPAT=],
|
|
|
|
[NO_EXPAT=YesPlease])
|
2009-03-12 19:20:09 +00:00
|
|
|
|
|
|
|
GIT_UNSTASH_FLAGS($EXPATDIR)
|
|
|
|
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_EXPAT])
|
2009-03-12 19:20:09 +00:00
|
|
|
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2007-02-18 08:44:42 +00:00
|
|
|
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin and
|
|
|
|
# some Solaris installations).
|
2006-09-07 11:48:08 +00:00
|
|
|
# Define NO_ICONV if neither libc nor libiconv support iconv.
|
2009-03-12 19:20:09 +00:00
|
|
|
|
2009-06-09 03:46:38 +00:00
|
|
|
if test -z "$NO_ICONV"; then
|
|
|
|
|
2009-03-12 19:20:09 +00:00
|
|
|
GIT_STASH_FLAGS($ICONVDIR)
|
|
|
|
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_DEFUN([ICONVTEST_SRC],
|
|
|
|
[AC_LANG_PROGRAM([#include <iconv.h>],
|
|
|
|
[iconv_open("", "");])])
|
2009-03-12 19:20:11 +00:00
|
|
|
|
|
|
|
if test -n "$ICONVDIR"; then
|
|
|
|
lib_order="-liconv -lc"
|
|
|
|
else
|
|
|
|
lib_order="-lc -liconv"
|
|
|
|
fi
|
|
|
|
|
|
|
|
NO_ICONV=YesPlease
|
|
|
|
|
|
|
|
for l in $lib_order; do
|
|
|
|
if test "$l" = "-liconv"; then
|
|
|
|
NEEDS_LIBICONV=YesPlease
|
|
|
|
else
|
|
|
|
NEEDS_LIBICONV=
|
|
|
|
fi
|
|
|
|
|
|
|
|
old_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS $l"
|
|
|
|
AC_MSG_CHECKING([for iconv in $l])
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_LINK_IFELSE([ICONVTEST_SRC],
|
2007-02-18 08:44:42 +00:00
|
|
|
[AC_MSG_RESULT([yes])
|
2009-03-12 19:20:11 +00:00
|
|
|
NO_ICONV=
|
|
|
|
break],
|
|
|
|
[AC_MSG_RESULT([no])])
|
|
|
|
LIBS="$old_LIBS"
|
|
|
|
done
|
|
|
|
|
|
|
|
#in case of break
|
|
|
|
LIBS="$old_LIBS"
|
2009-03-12 19:20:09 +00:00
|
|
|
|
|
|
|
GIT_UNSTASH_FLAGS($ICONVDIR)
|
|
|
|
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NEEDS_LIBICONV])
|
|
|
|
GIT_CONF_SUBST([NO_ICONV])
|
2009-03-12 19:20:09 +00:00
|
|
|
|
2009-06-09 03:46:38 +00:00
|
|
|
if test -n "$NO_ICONV"; then
|
|
|
|
NEEDS_LIBICONV=
|
|
|
|
fi
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2007-11-07 03:24:28 +00:00
|
|
|
# Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.
|
2009-03-12 19:20:09 +00:00
|
|
|
|
|
|
|
GIT_STASH_FLAGS($ZLIB_PATH)
|
|
|
|
|
2007-11-07 03:24:28 +00:00
|
|
|
AC_DEFUN([ZLIBTEST_SRC], [
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_LANG_PROGRAM([#include <zlib.h>],
|
|
|
|
[deflateBound(0, 0);])])
|
2007-11-07 03:24:28 +00:00
|
|
|
AC_MSG_CHECKING([for deflateBound in -lz])
|
|
|
|
old_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS -lz"
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_LINK_IFELSE([ZLIBTEST_SRC],
|
2007-11-07 03:24:28 +00:00
|
|
|
[AC_MSG_RESULT([yes])],
|
|
|
|
[AC_MSG_RESULT([no])
|
|
|
|
NO_DEFLATE_BOUND=yes])
|
|
|
|
LIBS="$old_LIBS"
|
2009-03-12 19:20:09 +00:00
|
|
|
|
|
|
|
GIT_UNSTASH_FLAGS($ZLIB_PATH)
|
|
|
|
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_DEFLATE_BOUND])
|
2009-03-12 19:20:09 +00:00
|
|
|
|
2007-11-07 03:24:28 +00:00
|
|
|
#
|
2006-07-08 21:07:08 +00:00
|
|
|
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
|
|
|
|
# Patrick Mauritz).
|
2006-08-04 21:43:59 +00:00
|
|
|
AC_CHECK_LIB([c], [socket],
|
2006-08-08 16:39:06 +00:00
|
|
|
[NEEDS_SOCKET=],
|
|
|
|
[NEEDS_SOCKET=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NEEDS_SOCKET])
|
2006-08-15 09:01:27 +00:00
|
|
|
test -n "$NEEDS_SOCKET" && LIBS="$LIBS -lsocket"
|
2006-07-08 21:07:08 +00:00
|
|
|
|
2009-06-07 05:40:29 +00:00
|
|
|
#
|
2010-05-14 09:31:41 +00:00
|
|
|
# The next few tests will define NEEDS_RESOLV if linking with
|
|
|
|
# libresolv provides some of the functions we would normally get
|
|
|
|
# from libc.
|
|
|
|
NEEDS_RESOLV=
|
|
|
|
#
|
|
|
|
# Define NO_INET_NTOP if linking with -lresolv is not enough.
|
|
|
|
# Solaris 2.7 in particular hos inet_ntop in -lresolv.
|
|
|
|
NO_INET_NTOP=
|
|
|
|
AC_CHECK_FUNC([inet_ntop],
|
2012-09-11 15:45:30 +00:00
|
|
|
[],
|
2010-05-14 09:31:41 +00:00
|
|
|
[AC_CHECK_LIB([resolv], [inet_ntop],
|
2012-09-11 15:45:30 +00:00
|
|
|
[NEEDS_RESOLV=YesPlease],
|
2010-05-14 09:31:41 +00:00
|
|
|
[NO_INET_NTOP=YesPlease])
|
|
|
|
])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_INET_NTOP])
|
2010-05-14 09:31:41 +00:00
|
|
|
#
|
|
|
|
# Define NO_INET_PTON if linking with -lresolv is not enough.
|
|
|
|
# Solaris 2.7 in particular hos inet_pton in -lresolv.
|
|
|
|
NO_INET_PTON=
|
|
|
|
AC_CHECK_FUNC([inet_pton],
|
2012-09-11 15:45:30 +00:00
|
|
|
[],
|
2010-05-14 09:31:41 +00:00
|
|
|
[AC_CHECK_LIB([resolv], [inet_pton],
|
2012-09-11 15:45:30 +00:00
|
|
|
[NEEDS_RESOLV=YesPlease],
|
2010-05-14 09:31:41 +00:00
|
|
|
[NO_INET_PTON=YesPlease])
|
|
|
|
])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_INET_PTON])
|
2010-05-14 09:31:40 +00:00
|
|
|
#
|
|
|
|
# Define NO_HSTRERROR if linking with -lresolv is not enough.
|
|
|
|
# Solaris 2.6 in particular has no hstrerror, even in -lresolv.
|
|
|
|
NO_HSTRERROR=
|
|
|
|
AC_CHECK_FUNC([hstrerror],
|
2012-09-11 15:45:30 +00:00
|
|
|
[],
|
2010-05-14 09:31:40 +00:00
|
|
|
[AC_CHECK_LIB([resolv], [hstrerror],
|
2012-09-11 15:45:30 +00:00
|
|
|
[NEEDS_RESOLV=YesPlease],
|
2010-05-14 09:31:40 +00:00
|
|
|
[NO_HSTRERROR=YesPlease])
|
|
|
|
])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_HSTRERROR])
|
|
|
|
|
|
|
|
dnl This must go after all the possible places for its initialization,
|
|
|
|
dnl in the AC_CHECK_FUNC invocations above.
|
|
|
|
GIT_CONF_SUBST([NEEDS_RESOLV])
|
2010-05-14 09:31:41 +00:00
|
|
|
#
|
|
|
|
# If any of the above tests determined that -lresolv is needed at
|
|
|
|
# build-time, also set it here for remaining configure-time checks.
|
2009-06-07 05:40:29 +00:00
|
|
|
test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv"
|
2006-07-08 21:07:08 +00:00
|
|
|
|
2009-07-21 20:23:06 +00:00
|
|
|
AC_CHECK_LIB([c], [basename],
|
2009-07-10 17:10:45 +00:00
|
|
|
[NEEDS_LIBGEN=],
|
|
|
|
[NEEDS_LIBGEN=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NEEDS_LIBGEN])
|
2009-07-10 17:10:45 +00:00
|
|
|
test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen"
|
|
|
|
|
2019-04-18 05:04:19 +00:00
|
|
|
AC_DEFUN([LIBINTL_SRC], [
|
|
|
|
AC_LANG_PROGRAM([[
|
|
|
|
#include <libintl.h>
|
|
|
|
]],[[
|
|
|
|
char *msg = gettext("test");
|
|
|
|
]])])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([if libc contains libintl])
|
|
|
|
AC_LINK_IFELSE([LIBINTL_SRC],
|
|
|
|
[AC_MSG_RESULT([yes])
|
|
|
|
LIBC_CONTAINS_LIBINTL=YesPlease],
|
|
|
|
[AC_MSG_RESULT([no])
|
|
|
|
LIBC_CONTAINS_LIBINTL=])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([LIBC_CONTAINS_LIBINTL])
|
2012-02-18 19:38:04 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Define NO_GETTEXT if you don't want Git output to be translated.
|
|
|
|
# A translated Git requires GNU libintl or another gettext implementation
|
|
|
|
AC_CHECK_HEADER([libintl.h],
|
|
|
|
[NO_GETTEXT=],
|
|
|
|
[NO_GETTEXT=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_GETTEXT])
|
2012-02-18 19:38:04 +00:00
|
|
|
|
|
|
|
if test -z "$NO_GETTEXT"; then
|
|
|
|
test -n "$LIBC_CONTAINS_LIBINTL" || LIBS="$LIBS -lintl"
|
|
|
|
fi
|
i18n: add infrastructure for translating Git with gettext
Change the skeleton implementation of i18n in Git to one that can show
localized strings to users for our C, Shell and Perl programs using
either GNU libintl or the Solaris gettext implementation.
This new internationalization support is enabled by default. If
gettext isn't available, or if Git is compiled with
NO_GETTEXT=YesPlease, Git falls back on its current behavior of
showing interface messages in English. When using the autoconf script
we'll auto-detect if the gettext libraries are installed and act
appropriately.
This change is somewhat large because as well as adding a C, Shell and
Perl i18n interface we're adding a lot of tests for them, and for
those tests to work we need a skeleton PO file to actually test
translations. A minimal Icelandic translation is included for this
purpose. Icelandic includes multi-byte characters which makes it easy
to test various edge cases, and it's a language I happen to
understand.
The rest of the commit message goes into detail about various
sub-parts of this commit.
= Installation
Gettext .mo files will be installed and looked for in the standard
$(prefix)/share/locale path. GIT_TEXTDOMAINDIR can also be set to
override that, but that's only intended to be used to test Git itself.
= Perl
Perl code that's to be localized should use the new Git::I18n
module. It imports a __ function into the caller's package by default.
Instead of using the high level Locale::TextDomain interface I've
opted to use the low-level (equivalent to the C interface)
Locale::Messages module, which Locale::TextDomain itself uses.
Locale::TextDomain does a lot of redundant work we don't need, and
some of it would potentially introduce bugs. It tries to set the
$TEXTDOMAIN based on package of the caller, and has its own
hardcoded paths where it'll search for messages.
I found it easier just to completely avoid it rather than try to
circumvent its behavior. In any case, this is an issue wholly
internal Git::I18N. Its guts can be changed later if that's deemed
necessary.
See <AANLkTilYD_NyIZMyj9dHtVk-ylVBfvyxpCC7982LWnVd@mail.gmail.com> for
a further elaboration on this topic.
= Shell
Shell code that's to be localized should use the git-sh-i18n
library. It's basically just a wrapper for the system's gettext.sh.
If gettext.sh isn't available we'll fall back on gettext(1) if it's
available. The latter is available without the former on Solaris,
which has its own non-GNU gettext implementation. We also need to
emulate eval_gettext() there.
If neither are present we'll use a dumb printf(1) fall-through
wrapper.
= About libcharset.h and langinfo.h
We use libcharset to query the character set of the current locale if
it's available. I.e. we'll use it instead of nl_langinfo if
HAVE_LIBCHARSET_H is set.
The GNU gettext manual recommends using langinfo.h's
nl_langinfo(CODESET) to acquire the current character set, but on
systems that have libcharset.h's locale_charset() using the latter is
either saner, or the only option on those systems.
GNU and Solaris have a nl_langinfo(CODESET), FreeBSD can use either,
but MinGW and some others need to use libcharset.h's locale_charset()
instead.
=Credits
This patch is based on work by Jeff Epler <jepler@unpythonic.net> who
did the initial Makefile / C work, and a lot of comments from the Git
mailing list, including Jonathan Nieder, Jakub Narebski, Johannes
Sixt, Erik Faye-Lund, Peter Krefting, Junio C Hamano, Thomas Rast and
others.
[jc: squashed a small Makefile fix from Ramsay]
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-17 23:14:42 +00:00
|
|
|
|
2006-07-08 21:07:08 +00:00
|
|
|
## Checks for header files.
|
2007-12-07 01:27:20 +00:00
|
|
|
AC_MSG_NOTICE([CHECKS for header files])
|
|
|
|
#
|
2008-01-25 11:19:41 +00:00
|
|
|
# Define NO_SYS_SELECT_H if you don't have sys/select.h.
|
|
|
|
AC_CHECK_HEADER([sys/select.h],
|
|
|
|
[NO_SYS_SELECT_H=],
|
|
|
|
[NO_SYS_SELECT_H=UnfortunatelyYes])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_SYS_SELECT_H])
|
2008-01-25 11:19:41 +00:00
|
|
|
#
|
2018-11-14 01:10:43 +00:00
|
|
|
# Define NO_POLL_H if you don't have poll.h
|
|
|
|
AC_CHECK_HEADER([poll.h],
|
|
|
|
[NO_POLL_H=],
|
|
|
|
[NO_POLL_H=UnfortunatelyYes])
|
|
|
|
GIT_CONF_SUBST([NO_POLL_H])
|
|
|
|
#
|
2010-10-27 08:39:53 +00:00
|
|
|
# Define NO_SYS_POLL_H if you don't have sys/poll.h
|
|
|
|
AC_CHECK_HEADER([sys/poll.h],
|
|
|
|
[NO_SYS_POLL_H=],
|
|
|
|
[NO_SYS_POLL_H=UnfortunatelyYes])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_SYS_POLL_H])
|
2010-10-27 08:39:53 +00:00
|
|
|
#
|
|
|
|
# Define NO_INTTYPES_H if you don't have inttypes.h
|
|
|
|
AC_CHECK_HEADER([inttypes.h],
|
|
|
|
[NO_INTTYPES_H=],
|
|
|
|
[NO_INTTYPES_H=UnfortunatelyYes])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_INTTYPES_H])
|
2010-10-27 08:39:53 +00:00
|
|
|
#
|
2007-12-07 01:27:20 +00:00
|
|
|
# Define OLD_ICONV if your library has an old iconv(), where the second
|
|
|
|
# (input buffer pointer) parameter is declared with type (const char **).
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_DEFUN([OLDICONVTEST_SRC], [
|
|
|
|
AC_LANG_PROGRAM([[
|
2007-12-07 01:27:20 +00:00
|
|
|
#include <iconv.h>
|
|
|
|
|
|
|
|
extern size_t iconv(iconv_t cd,
|
|
|
|
char **inbuf, size_t *inbytesleft,
|
|
|
|
char **outbuf, size_t *outbytesleft);
|
2011-01-02 10:24:55 +00:00
|
|
|
]], [])])
|
2009-03-12 19:20:11 +00:00
|
|
|
|
|
|
|
GIT_STASH_FLAGS($ICONVDIR)
|
|
|
|
|
2007-12-07 01:27:20 +00:00
|
|
|
AC_MSG_CHECKING([for old iconv()])
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_COMPILE_IFELSE([OLDICONVTEST_SRC],
|
2007-12-07 01:27:20 +00:00
|
|
|
[AC_MSG_RESULT([no])],
|
|
|
|
[AC_MSG_RESULT([yes])
|
2019-11-08 09:43:44 +00:00
|
|
|
AC_DEFINE(HAVE_OLD_ICONV, 1)
|
2007-12-07 01:27:20 +00:00
|
|
|
OLD_ICONV=UnfortunatelyYes])
|
2006-07-08 21:07:08 +00:00
|
|
|
|
2009-03-12 19:20:11 +00:00
|
|
|
GIT_UNSTASH_FLAGS($ICONVDIR)
|
|
|
|
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([OLD_ICONV])
|
2006-07-08 21:07:08 +00:00
|
|
|
|
2019-11-08 09:43:44 +00:00
|
|
|
#
|
|
|
|
# Define ICONV_OMITS_BOM if you are on a system which
|
|
|
|
# iconv omits bom for utf-{16,32}
|
|
|
|
if test -z "$NO_ICONV"; then
|
|
|
|
AC_CACHE_CHECK([whether iconv omits bom for utf-16 and utf-32],
|
|
|
|
[ac_cv_iconv_omits_bom],
|
|
|
|
[
|
|
|
|
old_LIBS="$LIBS"
|
|
|
|
if test -n "$NEEDS_LIBICONV"; then
|
|
|
|
LIBS="$LIBS -liconv"
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_RUN_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
|
|
|
|
#include <iconv.h>
|
|
|
|
#ifdef HAVE_OLD_ICONV
|
|
|
|
typedef const char *iconv_ibp;
|
|
|
|
#else
|
|
|
|
typedef char *iconv_ibp;
|
|
|
|
#endif
|
|
|
|
],
|
|
|
|
[[
|
|
|
|
int v;
|
|
|
|
iconv_t conv;
|
|
|
|
char in[] = "a"; iconv_ibp pin = in;
|
|
|
|
char out[20] = ""; char *pout = out;
|
|
|
|
size_t isz = sizeof in;
|
|
|
|
size_t osz = sizeof out;
|
|
|
|
|
|
|
|
conv = iconv_open("UTF-16", "UTF-8");
|
|
|
|
iconv(conv, &pin, &isz, &pout, &osz);
|
|
|
|
iconv_close(conv);
|
|
|
|
v = (unsigned char)(out[0]) + (unsigned char)(out[1]);
|
|
|
|
return v != 0xfe + 0xff;
|
|
|
|
]])],
|
|
|
|
[ac_cv_iconv_omits_bom=no],
|
|
|
|
[ac_cv_iconv_omits_bom=yes])
|
|
|
|
|
|
|
|
LIBS="$old_LIBS"
|
|
|
|
])
|
|
|
|
if test "x$ac_cv_iconv_omits_bom" = xyes; then
|
|
|
|
ICONV_OMITS_BOM=Yes
|
|
|
|
else
|
|
|
|
ICONV_OMITS_BOM=
|
|
|
|
fi
|
|
|
|
GIT_CONF_SUBST([ICONV_OMITS_BOM])
|
|
|
|
fi
|
|
|
|
|
2006-07-08 21:07:08 +00:00
|
|
|
## Checks for typedefs, structures, and compiler characteristics.
|
2006-07-08 21:07:10 +00:00
|
|
|
AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics])
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2010-05-14 09:31:42 +00:00
|
|
|
TYPE_SOCKLEN_T
|
|
|
|
case $ac_cv_type_socklen_t in
|
2012-09-11 15:45:30 +00:00
|
|
|
yes) SOCKLEN_T='';;
|
|
|
|
*) SOCKLEN_T=$git_cv_socklen_t_equiv;;
|
2010-05-14 09:31:42 +00:00
|
|
|
esac
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([SOCKLEN_T])
|
2010-05-14 09:31:42 +00:00
|
|
|
|
2014-08-29 16:42:34 +00:00
|
|
|
#
|
|
|
|
# Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval.
|
|
|
|
AC_CHECK_TYPES([struct itimerval],
|
|
|
|
[NO_STRUCT_ITIMERVAL=],
|
|
|
|
[NO_STRUCT_ITIMERVAL=UnfortunatelyYes],
|
|
|
|
[#include <sys/time.h>])
|
|
|
|
GIT_CONF_SUBST([NO_STRUCT_ITIMERVAL])
|
|
|
|
#
|
2015-01-08 20:00:55 +00:00
|
|
|
# Define USE_ST_TIMESPEC=YesPlease when stat.st_mtimespec.tv_nsec exists.
|
|
|
|
# Define NO_NSEC=YesPlease when neither stat.st_mtim.tv_nsec nor
|
|
|
|
# stat.st_mtimespec.tv_nsec exists.
|
|
|
|
AC_CHECK_MEMBER([struct stat.st_mtimespec.tv_nsec])
|
|
|
|
AC_CHECK_MEMBER([struct stat.st_mtim.tv_nsec])
|
|
|
|
if test x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec = xyes; then
|
|
|
|
USE_ST_TIMESPEC=YesPlease
|
|
|
|
GIT_CONF_SUBST([USE_ST_TIMESPEC])
|
|
|
|
elif test x$ac_cv_member_struct_stat_st_mtim_tv_nsec != xyes; then
|
|
|
|
NO_NSEC=YesPlease
|
|
|
|
GIT_CONF_SUBST([NO_NSEC])
|
|
|
|
fi
|
|
|
|
#
|
2006-07-08 21:07:08 +00:00
|
|
|
# Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks
|
|
|
|
# d_type in struct dirent (latest Cygwin -- will be fixed soonish).
|
2006-08-04 21:43:59 +00:00
|
|
|
AC_CHECK_MEMBER(struct dirent.d_type,
|
2006-08-08 16:39:06 +00:00
|
|
|
[NO_D_TYPE_IN_DIRENT=],
|
|
|
|
[NO_D_TYPE_IN_DIRENT=YesPlease],
|
2006-07-08 21:07:10 +00:00
|
|
|
[#include <dirent.h>])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_D_TYPE_IN_DIRENT])
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2012-12-14 19:56:59 +00:00
|
|
|
# Define NO_GECOS_IN_PWENT if you don't have pw_gecos in struct passwd
|
|
|
|
# in the C library.
|
|
|
|
AC_CHECK_MEMBER(struct passwd.pw_gecos,
|
|
|
|
[NO_GECOS_IN_PWENT=],
|
|
|
|
[NO_GECOS_IN_PWENT=YesPlease],
|
|
|
|
[#include <pwd.h>])
|
|
|
|
GIT_CONF_SUBST([NO_GECOS_IN_PWENT])
|
|
|
|
#
|
2006-07-08 21:07:08 +00:00
|
|
|
# Define NO_SOCKADDR_STORAGE if your platform does not have struct
|
|
|
|
# sockaddr_storage.
|
2006-08-04 21:43:59 +00:00
|
|
|
AC_CHECK_TYPE(struct sockaddr_storage,
|
2006-08-08 16:39:06 +00:00
|
|
|
[NO_SOCKADDR_STORAGE=],
|
2006-08-15 09:01:25 +00:00
|
|
|
[NO_SOCKADDR_STORAGE=YesPlease],[
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_SOCKADDR_STORAGE])
|
2006-08-08 16:39:06 +00:00
|
|
|
#
|
2006-08-04 23:46:16 +00:00
|
|
|
# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
|
|
|
|
AC_CHECK_TYPE([struct addrinfo],[
|
2008-10-26 11:52:19 +00:00
|
|
|
GIT_CHECK_FUNC([getaddrinfo],
|
2006-08-08 16:39:06 +00:00
|
|
|
[NO_IPV6=],
|
|
|
|
[NO_IPV6=YesPlease])
|
|
|
|
],[NO_IPV6=YesPlease],[
|
2006-08-04 23:46:16 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <netdb.h>
|
|
|
|
])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_IPV6])
|
2006-08-04 15:55:57 +00:00
|
|
|
#
|
2016-10-07 11:30:52 +00:00
|
|
|
# Define NO_REGEX if your C library lacks regex support with REG_STARTEND
|
|
|
|
# feature.
|
|
|
|
AC_CACHE_CHECK([whether the platform regex supports REG_STARTEND],
|
|
|
|
[ac_cv_c_regex_with_reg_startend], [
|
2010-08-17 09:24:42 +00:00
|
|
|
AC_EGREP_CPP(yippeeyeswehaveit,
|
|
|
|
AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
|
|
|
|
#include <regex.h>
|
|
|
|
],
|
|
|
|
[#ifdef REG_STARTEND
|
|
|
|
yippeeyeswehaveit
|
|
|
|
#endif
|
|
|
|
]),
|
2016-10-07 11:30:52 +00:00
|
|
|
[ac_cv_c_regex_with_reg_startend=yes],
|
|
|
|
[ac_cv_c_regex_with_reg_startend=no])
|
2010-08-17 09:24:42 +00:00
|
|
|
])
|
2016-10-07 11:30:52 +00:00
|
|
|
if test $ac_cv_c_regex_with_reg_startend = yes; then
|
2010-08-17 09:24:42 +00:00
|
|
|
NO_REGEX=
|
|
|
|
else
|
|
|
|
NO_REGEX=YesPlease
|
|
|
|
fi
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_REGEX])
|
2010-08-17 09:24:42 +00:00
|
|
|
#
|
2008-03-11 08:48:34 +00:00
|
|
|
# Define FREAD_READS_DIRECTORIES if your are on a system which succeeds
|
|
|
|
# when attempting to read from an fopen'ed directory.
|
|
|
|
AC_CACHE_CHECK([whether system succeeds to read fopen'ed directory],
|
|
|
|
[ac_cv_fread_reads_directories],
|
|
|
|
[
|
|
|
|
AC_RUN_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
|
2017-06-14 05:30:18 +00:00
|
|
|
[[
|
2008-03-11 08:48:34 +00:00
|
|
|
FILE *f = fopen(".", "r");
|
2018-04-09 08:50:42 +00:00
|
|
|
return f != NULL;]])],
|
2008-03-11 08:48:34 +00:00
|
|
|
[ac_cv_fread_reads_directories=no],
|
|
|
|
[ac_cv_fread_reads_directories=yes])
|
|
|
|
])
|
|
|
|
if test $ac_cv_fread_reads_directories = yes; then
|
|
|
|
FREAD_READS_DIRECTORIES=UnfortunatelyYes
|
|
|
|
else
|
|
|
|
FREAD_READS_DIRECTORIES=
|
|
|
|
fi
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([FREAD_READS_DIRECTORIES])
|
2008-03-11 08:48:34 +00:00
|
|
|
#
|
2008-03-05 15:46:13 +00:00
|
|
|
# Define SNPRINTF_RETURNS_BOGUS if your are on a system which snprintf()
|
|
|
|
# or vsnprintf() return -1 instead of number of characters which would
|
|
|
|
# have been written to the final string if enough space had been available.
|
|
|
|
AC_CACHE_CHECK([whether snprintf() and/or vsnprintf() return bogus value],
|
|
|
|
[ac_cv_snprintf_returns_bogus],
|
|
|
|
[
|
|
|
|
AC_RUN_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
|
|
|
|
#include "stdarg.h"
|
|
|
|
|
|
|
|
int test_vsnprintf(char *str, size_t maxsize, const char *format, ...)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
va_list ap;
|
|
|
|
va_start(ap, format);
|
|
|
|
ret = vsnprintf(str, maxsize, format, ap);
|
|
|
|
va_end(ap);
|
|
|
|
return ret;
|
|
|
|
}],
|
|
|
|
[[char buf[6];
|
|
|
|
if (test_vsnprintf(buf, 3, "%s", "12345") != 5
|
|
|
|
|| strcmp(buf, "12")) return 1;
|
|
|
|
if (snprintf(buf, 3, "%s", "12345") != 5
|
|
|
|
|| strcmp(buf, "12")) return 1]])],
|
|
|
|
[ac_cv_snprintf_returns_bogus=no],
|
|
|
|
[ac_cv_snprintf_returns_bogus=yes])
|
|
|
|
])
|
|
|
|
if test $ac_cv_snprintf_returns_bogus = yes; then
|
|
|
|
SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
|
|
|
|
else
|
|
|
|
SNPRINTF_RETURNS_BOGUS=
|
|
|
|
fi
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([SNPRINTF_RETURNS_BOGUS])
|
2014-12-04 02:24:17 +00:00
|
|
|
#
|
|
|
|
# Define NEEDS_MODE_TRANSLATION if your OS strays from the typical file type
|
|
|
|
# bits in mode values.
|
|
|
|
AC_CACHE_CHECK([whether the platform uses typical file type bits],
|
|
|
|
[ac_cv_sane_mode_bits], [
|
|
|
|
AC_EGREP_CPP(yippeeyeswehaveit,
|
|
|
|
AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
|
|
|
|
[#if S_IFMT == 0170000 && \
|
|
|
|
S_IFREG == 0100000 && S_IFDIR == 0040000 && S_IFLNK == 0120000 && \
|
|
|
|
S_IFBLK == 0060000 && S_IFCHR == 0020000 && \
|
|
|
|
S_IFIFO == 0010000 && S_IFSOCK == 0140000
|
|
|
|
yippeeyeswehaveit
|
|
|
|
#endif
|
|
|
|
]),
|
|
|
|
[ac_cv_sane_mode_bits=yes],
|
|
|
|
[ac_cv_sane_mode_bits=no])
|
|
|
|
])
|
|
|
|
if test $ac_cv_sane_mode_bits = yes; then
|
|
|
|
NEEDS_MODE_TRANSLATION=
|
|
|
|
else
|
|
|
|
NEEDS_MODE_TRANSLATION=UnfortunatelyYes
|
|
|
|
fi
|
|
|
|
GIT_CONF_SUBST([NEEDS_MODE_TRANSLATION])
|
2006-07-08 21:07:08 +00:00
|
|
|
|
2006-08-09 00:15:10 +00:00
|
|
|
|
2006-07-08 21:07:08 +00:00
|
|
|
## Checks for library functions.
|
2006-07-08 21:07:11 +00:00
|
|
|
## (in default C library and libraries checked by AC_CHECK_LIB)
|
|
|
|
AC_MSG_NOTICE([CHECKS for library functions])
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2009-05-31 08:35:51 +00:00
|
|
|
# Define NO_LIBGEN_H if you don't have libgen.h.
|
|
|
|
AC_CHECK_HEADER([libgen.h],
|
|
|
|
[NO_LIBGEN_H=],
|
|
|
|
[NO_LIBGEN_H=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_LIBGEN_H])
|
2009-05-31 08:35:51 +00:00
|
|
|
#
|
2010-04-15 12:27:49 +00:00
|
|
|
# Define HAVE_PATHS_H if you have paths.h.
|
|
|
|
AC_CHECK_HEADER([paths.h],
|
|
|
|
[HAVE_PATHS_H=YesPlease],
|
|
|
|
[HAVE_PATHS_H=])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([HAVE_PATHS_H])
|
2010-04-15 12:27:49 +00:00
|
|
|
#
|
i18n: add infrastructure for translating Git with gettext
Change the skeleton implementation of i18n in Git to one that can show
localized strings to users for our C, Shell and Perl programs using
either GNU libintl or the Solaris gettext implementation.
This new internationalization support is enabled by default. If
gettext isn't available, or if Git is compiled with
NO_GETTEXT=YesPlease, Git falls back on its current behavior of
showing interface messages in English. When using the autoconf script
we'll auto-detect if the gettext libraries are installed and act
appropriately.
This change is somewhat large because as well as adding a C, Shell and
Perl i18n interface we're adding a lot of tests for them, and for
those tests to work we need a skeleton PO file to actually test
translations. A minimal Icelandic translation is included for this
purpose. Icelandic includes multi-byte characters which makes it easy
to test various edge cases, and it's a language I happen to
understand.
The rest of the commit message goes into detail about various
sub-parts of this commit.
= Installation
Gettext .mo files will be installed and looked for in the standard
$(prefix)/share/locale path. GIT_TEXTDOMAINDIR can also be set to
override that, but that's only intended to be used to test Git itself.
= Perl
Perl code that's to be localized should use the new Git::I18n
module. It imports a __ function into the caller's package by default.
Instead of using the high level Locale::TextDomain interface I've
opted to use the low-level (equivalent to the C interface)
Locale::Messages module, which Locale::TextDomain itself uses.
Locale::TextDomain does a lot of redundant work we don't need, and
some of it would potentially introduce bugs. It tries to set the
$TEXTDOMAIN based on package of the caller, and has its own
hardcoded paths where it'll search for messages.
I found it easier just to completely avoid it rather than try to
circumvent its behavior. In any case, this is an issue wholly
internal Git::I18N. Its guts can be changed later if that's deemed
necessary.
See <AANLkTilYD_NyIZMyj9dHtVk-ylVBfvyxpCC7982LWnVd@mail.gmail.com> for
a further elaboration on this topic.
= Shell
Shell code that's to be localized should use the git-sh-i18n
library. It's basically just a wrapper for the system's gettext.sh.
If gettext.sh isn't available we'll fall back on gettext(1) if it's
available. The latter is available without the former on Solaris,
which has its own non-GNU gettext implementation. We also need to
emulate eval_gettext() there.
If neither are present we'll use a dumb printf(1) fall-through
wrapper.
= About libcharset.h and langinfo.h
We use libcharset to query the character set of the current locale if
it's available. I.e. we'll use it instead of nl_langinfo if
HAVE_LIBCHARSET_H is set.
The GNU gettext manual recommends using langinfo.h's
nl_langinfo(CODESET) to acquire the current character set, but on
systems that have libcharset.h's locale_charset() using the latter is
either saner, or the only option on those systems.
GNU and Solaris have a nl_langinfo(CODESET), FreeBSD can use either,
but MinGW and some others need to use libcharset.h's locale_charset()
instead.
=Credits
This patch is based on work by Jeff Epler <jepler@unpythonic.net> who
did the initial Makefile / C work, and a lot of comments from the Git
mailing list, including Jonathan Nieder, Jakub Narebski, Johannes
Sixt, Erik Faye-Lund, Peter Krefting, Junio C Hamano, Thomas Rast and
others.
[jc: squashed a small Makefile fix from Ramsay]
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-17 23:14:42 +00:00
|
|
|
# Define HAVE_LIBCHARSET_H if have libcharset.h
|
|
|
|
AC_CHECK_HEADER([libcharset.h],
|
|
|
|
[HAVE_LIBCHARSET_H=YesPlease],
|
|
|
|
[HAVE_LIBCHARSET_H=])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([HAVE_LIBCHARSET_H])
|
2012-12-14 19:57:01 +00:00
|
|
|
#
|
|
|
|
# Define HAVE_STRINGS_H if you have strings.h
|
|
|
|
AC_CHECK_HEADER([strings.h],
|
|
|
|
[HAVE_STRINGS_H=YesPlease],
|
|
|
|
[HAVE_STRINGS_H=])
|
|
|
|
GIT_CONF_SUBST([HAVE_STRINGS_H])
|
2012-02-12 16:23:36 +00:00
|
|
|
# Define CHARSET_LIB if libiconv does not export the locale_charset symbol
|
|
|
|
# and libcharset does
|
|
|
|
CHARSET_LIB=
|
|
|
|
AC_CHECK_LIB([iconv], [locale_charset],
|
2014-03-11 18:35:29 +00:00
|
|
|
[CHARSET_LIB=-liconv],
|
2012-02-12 16:23:36 +00:00
|
|
|
[AC_CHECK_LIB([charset], [locale_charset],
|
2012-09-11 15:45:30 +00:00
|
|
|
[CHARSET_LIB=-lcharset])])
|
|
|
|
GIT_CONF_SUBST([CHARSET_LIB])
|
i18n: add infrastructure for translating Git with gettext
Change the skeleton implementation of i18n in Git to one that can show
localized strings to users for our C, Shell and Perl programs using
either GNU libintl or the Solaris gettext implementation.
This new internationalization support is enabled by default. If
gettext isn't available, or if Git is compiled with
NO_GETTEXT=YesPlease, Git falls back on its current behavior of
showing interface messages in English. When using the autoconf script
we'll auto-detect if the gettext libraries are installed and act
appropriately.
This change is somewhat large because as well as adding a C, Shell and
Perl i18n interface we're adding a lot of tests for them, and for
those tests to work we need a skeleton PO file to actually test
translations. A minimal Icelandic translation is included for this
purpose. Icelandic includes multi-byte characters which makes it easy
to test various edge cases, and it's a language I happen to
understand.
The rest of the commit message goes into detail about various
sub-parts of this commit.
= Installation
Gettext .mo files will be installed and looked for in the standard
$(prefix)/share/locale path. GIT_TEXTDOMAINDIR can also be set to
override that, but that's only intended to be used to test Git itself.
= Perl
Perl code that's to be localized should use the new Git::I18n
module. It imports a __ function into the caller's package by default.
Instead of using the high level Locale::TextDomain interface I've
opted to use the low-level (equivalent to the C interface)
Locale::Messages module, which Locale::TextDomain itself uses.
Locale::TextDomain does a lot of redundant work we don't need, and
some of it would potentially introduce bugs. It tries to set the
$TEXTDOMAIN based on package of the caller, and has its own
hardcoded paths where it'll search for messages.
I found it easier just to completely avoid it rather than try to
circumvent its behavior. In any case, this is an issue wholly
internal Git::I18N. Its guts can be changed later if that's deemed
necessary.
See <AANLkTilYD_NyIZMyj9dHtVk-ylVBfvyxpCC7982LWnVd@mail.gmail.com> for
a further elaboration on this topic.
= Shell
Shell code that's to be localized should use the git-sh-i18n
library. It's basically just a wrapper for the system's gettext.sh.
If gettext.sh isn't available we'll fall back on gettext(1) if it's
available. The latter is available without the former on Solaris,
which has its own non-GNU gettext implementation. We also need to
emulate eval_gettext() there.
If neither are present we'll use a dumb printf(1) fall-through
wrapper.
= About libcharset.h and langinfo.h
We use libcharset to query the character set of the current locale if
it's available. I.e. we'll use it instead of nl_langinfo if
HAVE_LIBCHARSET_H is set.
The GNU gettext manual recommends using langinfo.h's
nl_langinfo(CODESET) to acquire the current character set, but on
systems that have libcharset.h's locale_charset() using the latter is
either saner, or the only option on those systems.
GNU and Solaris have a nl_langinfo(CODESET), FreeBSD can use either,
but MinGW and some others need to use libcharset.h's locale_charset()
instead.
=Credits
This patch is based on work by Jeff Epler <jepler@unpythonic.net> who
did the initial Makefile / C work, and a lot of comments from the Git
mailing list, including Jonathan Nieder, Jakub Narebski, Johannes
Sixt, Erik Faye-Lund, Peter Krefting, Junio C Hamano, Thomas Rast and
others.
[jc: squashed a small Makefile fix from Ramsay]
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-17 23:14:42 +00:00
|
|
|
#
|
2015-01-08 20:00:56 +00:00
|
|
|
# Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
|
|
|
|
GIT_CHECK_FUNC(clock_gettime,
|
|
|
|
[HAVE_CLOCK_GETTIME=YesPlease],
|
|
|
|
[HAVE_CLOCK_GETTIME=])
|
|
|
|
GIT_CONF_SUBST([HAVE_CLOCK_GETTIME])
|
|
|
|
|
|
|
|
AC_DEFUN([CLOCK_MONOTONIC_SRC], [
|
|
|
|
AC_LANG_PROGRAM([[
|
|
|
|
#include <time.h>
|
|
|
|
clockid_t id = CLOCK_MONOTONIC;
|
|
|
|
]])])
|
|
|
|
|
|
|
|
#
|
|
|
|
# Define HAVE_CLOCK_MONOTONIC=YesPlease if CLOCK_MONOTONIC is available.
|
|
|
|
AC_MSG_CHECKING([for CLOCK_MONOTONIC])
|
|
|
|
AC_COMPILE_IFELSE([CLOCK_MONOTONIC_SRC],
|
|
|
|
[AC_MSG_RESULT([yes])
|
|
|
|
HAVE_CLOCK_MONOTONIC=YesPlease],
|
|
|
|
[AC_MSG_RESULT([no])
|
|
|
|
HAVE_CLOCK_MONOTONIC=])
|
|
|
|
GIT_CONF_SUBST([HAVE_CLOCK_MONOTONIC])
|
|
|
|
#
|
2014-08-29 16:42:35 +00:00
|
|
|
# Define NO_SETITIMER if you don't have setitimer.
|
|
|
|
GIT_CHECK_FUNC(setitimer,
|
|
|
|
[NO_SETITIMER=],
|
|
|
|
[NO_SETITIMER=YesPlease])
|
|
|
|
GIT_CONF_SUBST([NO_SETITIMER])
|
|
|
|
#
|
2006-07-08 21:07:08 +00:00
|
|
|
# Define NO_STRCASESTR if you don't have strcasestr.
|
2008-10-26 11:52:19 +00:00
|
|
|
GIT_CHECK_FUNC(strcasestr,
|
2006-08-08 16:39:06 +00:00
|
|
|
[NO_STRCASESTR=],
|
|
|
|
[NO_STRCASESTR=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_STRCASESTR])
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2007-11-19 18:47:05 +00:00
|
|
|
# Define NO_MEMMEM if you don't have memmem.
|
2008-10-26 11:52:19 +00:00
|
|
|
GIT_CHECK_FUNC(memmem,
|
2007-11-19 18:47:05 +00:00
|
|
|
[NO_MEMMEM=],
|
|
|
|
[NO_MEMMEM=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_MEMMEM])
|
2007-11-19 18:47:05 +00:00
|
|
|
#
|
2006-07-08 21:07:08 +00:00
|
|
|
# Define NO_STRLCPY if you don't have strlcpy.
|
2008-10-26 11:52:19 +00:00
|
|
|
GIT_CHECK_FUNC(strlcpy,
|
2006-08-08 16:39:06 +00:00
|
|
|
[NO_STRLCPY=],
|
|
|
|
[NO_STRLCPY=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_STRLCPY])
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2008-10-26 11:52:37 +00:00
|
|
|
# Define NO_UINTMAX_T if your platform does not have uintmax_t
|
|
|
|
AC_CHECK_TYPE(uintmax_t,
|
|
|
|
[NO_UINTMAX_T=],
|
|
|
|
[NO_UINTMAX_T=YesPlease],[
|
|
|
|
#include <inttypes.h>
|
|
|
|
])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_UINTMAX_T])
|
2008-10-26 11:52:37 +00:00
|
|
|
#
|
2007-11-19 18:47:05 +00:00
|
|
|
# Define NO_STRTOUMAX if you don't have strtoumax in the C library.
|
2008-10-26 11:52:19 +00:00
|
|
|
GIT_CHECK_FUNC(strtoumax,
|
2007-11-19 18:47:05 +00:00
|
|
|
[NO_STRTOUMAX=],
|
|
|
|
[NO_STRTOUMAX=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_STRTOUMAX])
|
2007-11-19 18:47:05 +00:00
|
|
|
#
|
2006-07-08 21:07:08 +00:00
|
|
|
# Define NO_SETENV if you don't have setenv in the C library.
|
2008-10-26 11:52:19 +00:00
|
|
|
GIT_CHECK_FUNC(setenv,
|
2006-08-08 16:39:06 +00:00
|
|
|
[NO_SETENV=],
|
|
|
|
[NO_SETENV=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_SETENV])
|
2006-07-08 21:07:14 +00:00
|
|
|
#
|
2008-01-18 01:03:51 +00:00
|
|
|
# Define NO_UNSETENV if you don't have unsetenv in the C library.
|
2008-10-26 11:52:19 +00:00
|
|
|
GIT_CHECK_FUNC(unsetenv,
|
2008-01-18 01:03:51 +00:00
|
|
|
[NO_UNSETENV=],
|
|
|
|
[NO_UNSETENV=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_UNSETENV])
|
2008-01-18 01:03:51 +00:00
|
|
|
#
|
2007-11-19 18:47:05 +00:00
|
|
|
# Define NO_MKDTEMP if you don't have mkdtemp in the C library.
|
2008-10-26 11:52:19 +00:00
|
|
|
GIT_CHECK_FUNC(mkdtemp,
|
2007-11-19 18:47:05 +00:00
|
|
|
[NO_MKDTEMP=],
|
|
|
|
[NO_MKDTEMP=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_MKDTEMP])
|
2007-11-19 18:47:05 +00:00
|
|
|
#
|
2010-10-27 08:39:53 +00:00
|
|
|
# Define NO_INITGROUPS if you don't have initgroups in the C library.
|
|
|
|
GIT_CHECK_FUNC(initgroups,
|
|
|
|
[NO_INITGROUPS=],
|
|
|
|
[NO_INITGROUPS=YesPlease])
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([NO_INITGROUPS])
|
2010-10-27 08:39:53 +00:00
|
|
|
#
|
2015-06-02 21:15:44 +00:00
|
|
|
# Define HAVE_GETDELIM if you have getdelim in the C library.
|
|
|
|
GIT_CHECK_FUNC(getdelim,
|
|
|
|
[HAVE_GETDELIM=YesPlease],
|
|
|
|
[HAVE_GETDELIM=])
|
|
|
|
GIT_CONF_SUBST([HAVE_GETDELIM])
|
|
|
|
#
|
2009-05-31 08:35:50 +00:00
|
|
|
#
|
2006-07-08 21:07:08 +00:00
|
|
|
# Define NO_MMAP if you want to avoid mmap.
|
|
|
|
#
|
|
|
|
# Define NO_ICONV if your libc does not properly support iconv.
|
|
|
|
|
2015-03-08 07:14:36 +00:00
|
|
|
AC_DEFUN([BSD_SYSCTL_SRC], [
|
|
|
|
AC_LANG_PROGRAM([[
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/sysctl.h>
|
|
|
|
]],[[
|
|
|
|
int val, mib[2];
|
|
|
|
size_t len;
|
|
|
|
mib[0] = CTL_HW;
|
|
|
|
mib[1] = 1;
|
|
|
|
len = sizeof(val);
|
|
|
|
return sysctl(mib, 2, &val, &len, NULL, 0) ? 1 : 0;
|
|
|
|
]])])
|
|
|
|
|
|
|
|
#
|
|
|
|
# Define HAVE_BSD_SYSCTL=YesPlease if a BSD-compatible sysctl function is available.
|
|
|
|
AC_MSG_CHECKING([for BSD sysctl])
|
|
|
|
AC_COMPILE_IFELSE([BSD_SYSCTL_SRC],
|
|
|
|
[AC_MSG_RESULT([yes])
|
|
|
|
HAVE_BSD_SYSCTL=YesPlease],
|
|
|
|
[AC_MSG_RESULT([no])
|
|
|
|
HAVE_BSD_SYSCTL=])
|
|
|
|
GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
|
2006-07-08 21:07:08 +00:00
|
|
|
|
|
|
|
## Other checks.
|
|
|
|
# Define USE_PIC if you need the main git objects to be built with -fPIC
|
|
|
|
# in order to build and link perl/Git.so. x86-64 seems to need this.
|
|
|
|
#
|
|
|
|
# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
|
|
|
|
# Enable it on Windows. By default, symrefs are still used.
|
2008-11-03 18:14:28 +00:00
|
|
|
#
|
2010-01-30 01:22:19 +00:00
|
|
|
# Define NO_PTHREADS if we do not have pthreads.
|
2008-11-15 12:08:14 +00:00
|
|
|
#
|
2010-01-30 01:22:19 +00:00
|
|
|
# Define PTHREAD_LIBS to the linker flag used for Pthread support.
|
2009-03-12 19:20:12 +00:00
|
|
|
AC_DEFUN([PTHREADTEST_SRC], [
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_LANG_PROGRAM([[
|
2009-03-12 19:20:12 +00:00
|
|
|
#include <pthread.h>
|
2016-07-18 10:22:08 +00:00
|
|
|
static void *noop(void *ignore) { return ignore; }
|
2011-01-02 10:24:55 +00:00
|
|
|
]], [[
|
2009-03-12 19:20:12 +00:00
|
|
|
pthread_mutex_t test_mutex;
|
2011-03-28 07:39:59 +00:00
|
|
|
pthread_key_t test_key;
|
2016-07-18 10:22:08 +00:00
|
|
|
pthread_t th;
|
2010-05-14 09:31:34 +00:00
|
|
|
int retcode = 0;
|
2016-07-18 10:22:08 +00:00
|
|
|
void *ret = (void *)0;
|
2011-03-28 07:39:59 +00:00
|
|
|
retcode |= pthread_key_create(&test_key, (void *)0);
|
2010-05-14 09:31:34 +00:00
|
|
|
retcode |= pthread_mutex_init(&test_mutex,(void *)0);
|
|
|
|
retcode |= pthread_mutex_lock(&test_mutex);
|
|
|
|
retcode |= pthread_mutex_unlock(&test_mutex);
|
2016-07-18 10:22:08 +00:00
|
|
|
retcode |= pthread_create(&th, ret, noop, ret);
|
|
|
|
retcode |= pthread_join(th, &ret);
|
2010-05-14 09:31:34 +00:00
|
|
|
return retcode;
|
2011-01-02 10:24:55 +00:00
|
|
|
]])])
|
2009-03-12 19:20:12 +00:00
|
|
|
|
|
|
|
dnl AC_LANG_CONFTEST([AC_LANG_PROGRAM(
|
|
|
|
dnl [[#include <pthread.h>]],
|
|
|
|
dnl [[pthread_mutex_t test_mutex;]]
|
|
|
|
dnl )])
|
|
|
|
|
|
|
|
NO_PTHREADS=UnfortunatelyYes
|
|
|
|
PTHREAD_LIBS=
|
|
|
|
|
|
|
|
if test -n "$USER_NOPTHREAD"; then
|
|
|
|
AC_MSG_NOTICE([Skipping POSIX Threads at user request.])
|
|
|
|
# handle these separately since PTHREAD_CFLAGS could be '-lpthreads
|
|
|
|
# -D_REENTRANT' or some such.
|
|
|
|
elif test -z "$PTHREAD_CFLAGS"; then
|
2010-05-14 09:31:34 +00:00
|
|
|
threads_found=no
|
2012-11-27 23:28:51 +00:00
|
|
|
# Attempt to compile and link some code using pthreads to determine
|
|
|
|
# required linker flags. The order is somewhat important here: We
|
|
|
|
# first try it without any extra flags, to catch systems where
|
|
|
|
# pthreads are part of the C library, then go on testing various other
|
|
|
|
# flags. We do so to avoid false positives. For example, on Mac OS X
|
|
|
|
# pthreads are part of the C library; moreover, the compiler allows us
|
|
|
|
# to add "-mt" to the CFLAGS (although it will do nothing except
|
|
|
|
# trigger a warning about an unused flag). Hence if we checked for
|
|
|
|
# "-mt" before "" we would end up picking it. But unfortunately this
|
|
|
|
# would then trigger compiler warnings on every single file we compile.
|
|
|
|
for opt in "" -mt -pthread -lpthread; do
|
2009-03-12 19:20:12 +00:00
|
|
|
old_CFLAGS="$CFLAGS"
|
2015-11-06 01:11:37 +00:00
|
|
|
old_LIBS="$LIBS"
|
|
|
|
case "$opt" in
|
|
|
|
-l*) LIBS="$opt $LIBS" ;;
|
|
|
|
*) CFLAGS="$opt $CFLAGS" ;;
|
|
|
|
esac
|
|
|
|
|
2012-10-24 15:34:27 +00:00
|
|
|
AC_MSG_CHECKING([for POSIX Threads with '$opt'])
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_LINK_IFELSE([PTHREADTEST_SRC],
|
2009-03-12 19:20:12 +00:00
|
|
|
[AC_MSG_RESULT([yes])
|
|
|
|
NO_PTHREADS=
|
|
|
|
PTHREAD_LIBS="$opt"
|
2010-05-14 09:31:34 +00:00
|
|
|
PTHREAD_CFLAGS="$opt"
|
|
|
|
threads_found=yes
|
2009-03-12 19:20:12 +00:00
|
|
|
break
|
|
|
|
],
|
|
|
|
[AC_MSG_RESULT([no])])
|
|
|
|
CFLAGS="$old_CFLAGS"
|
2015-11-06 01:11:37 +00:00
|
|
|
LIBS="$old_LIBS"
|
2009-03-12 19:20:12 +00:00
|
|
|
done
|
2010-05-14 09:31:34 +00:00
|
|
|
if test $threads_found != yes; then
|
|
|
|
AC_CHECK_LIB([pthread], [pthread_create],
|
|
|
|
[PTHREAD_LIBS="-lpthread"],
|
|
|
|
[NO_PTHREADS=UnfortunatelyYes])
|
|
|
|
fi
|
2008-11-03 18:14:28 +00:00
|
|
|
else
|
2009-03-12 19:20:12 +00:00
|
|
|
old_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
|
2012-10-24 15:34:27 +00:00
|
|
|
AC_MSG_CHECKING([for POSIX Threads with '$PTHREAD_CFLAGS'])
|
2011-01-02 10:24:55 +00:00
|
|
|
AC_LINK_IFELSE([PTHREADTEST_SRC],
|
2009-03-12 19:20:12 +00:00
|
|
|
[AC_MSG_RESULT([yes])
|
|
|
|
NO_PTHREADS=
|
|
|
|
PTHREAD_LIBS="$PTHREAD_CFLAGS"
|
|
|
|
],
|
|
|
|
[AC_MSG_RESULT([no])])
|
|
|
|
|
|
|
|
CFLAGS="$old_CFLAGS"
|
2008-11-03 18:14:28 +00:00
|
|
|
fi
|
2009-03-12 19:20:12 +00:00
|
|
|
|
|
|
|
CFLAGS="$old_CFLAGS"
|
|
|
|
|
2012-09-11 15:45:30 +00:00
|
|
|
GIT_CONF_SUBST([PTHREAD_CFLAGS])
|
|
|
|
GIT_CONF_SUBST([PTHREAD_LIBS])
|
|
|
|
GIT_CONF_SUBST([NO_PTHREADS])
|
2006-07-08 21:07:08 +00:00
|
|
|
|
|
|
|
## Output files
|
2012-07-19 07:50:00 +00:00
|
|
|
AC_CONFIG_FILES(["${config_file}":"${config_in}"])
|
2006-07-02 23:56:48 +00:00
|
|
|
AC_OUTPUT
|