diff options
| author |   Roland Hieber <rohieb@users.noreply.github.com> | 2021-02-09 02:05:25 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2021-02-08 17:05:25 -0800 |
| commit | e1f77695132e814728cda982f11342a2e3c7272c (patch) | |
| tree | 0257b7b939cedffc7dda48ef96b8e7bfdb8dc9fa /pyconfig.h.in | |
| parent | bpo-40692: Run more test_concurrent_futures tests (GH-20239) (diff) | |
| download | cpython-e1f77695132e814728cda982f11342a2e3c7272c.tar.gz cpython-e1f77695132e814728cda982f11342a2e3c7272c.tar.bz2 cpython-e1f77695132e814728cda982f11342a2e3c7272c.zip | |
bpo-13501: allow choosing between readline and libedit (GH-24189)
In contrast to macOS, libedit is available as its own include file and
library on Linux systems to prevent file name clashes. So if both
libraries are available on the system, readline is currently chosen by
default; and if only libedit is available, it is not found at all. This
patch adds a way to link against libedit by adding the following
arguments to configure:
--with-readline link against libreadline (the default)
--with-readline=editline link against libeditline
--with-readline=no disable building the readline module
--without-readline (same)
The runtime detection of libedit vs. readline was already done in commit
7105319ada2e66365902 (2019-12-04, serge-sans-paille: "bpo-38634: Allow
non-apple build to cope with libedit (GH-16986)").
Fixes: GH-12076 ("bpo-13501 Build or disable readline with Editline")
Fixes: bpo-13501 ("Make libedit support more generic; port readline / libedit to FreeBSD")
Co-authored-by: Enji Cooper (ngie-eign)
Co-authored-by: Martin Panter (vadmium)
Co-authored-by: Robert Marshall (kellinm)
Diffstat (limited to 'pyconfig.h.in')
| -rw-r--r-- | pyconfig.h.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pyconfig.h.in b/pyconfig.h.in index 045cbd53aee..b65004ee2e8 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -610,7 +610,7 @@ /* Define to 1 if you have the <libintl.h> header file. */ #undef HAVE_LIBINTL_H -/* Define if you have the readline library (-lreadline). */ +/* Define to build the readline module. */ #undef HAVE_LIBREADLINE /* Define to 1 if you have the `resolv' library (-lresolv). */ @@ -1554,6 +1554,9 @@ Dyld is necessary to support frameworks. */ #undef WITH_DYLD +/* Define to build the readline module against Editline. */ +#undef WITH_EDITLINE + /* Define to 1 if libintl is needed for locale functions. */ #undef WITH_LIBINTL |