mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-13501: allow choosing between readline and libedit (GH-24189)

Browse source 
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
7105319ada (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)
This commit is contained in:
Roland Hieber 2021-02-09 02:05:25 +01:00 • committed by GitHub
parent bf2e7e55d7
commit e1f7769513
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 275 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/readline.c
View file

@ -26,10 +26,14 @@
# define RESTORE_LOCALE(sl)
#endif
#ifdef WITH_EDITLINE
# include <editline/readline.h>
#else
/* GNU readline definitions */
#undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
#include <readline/readline.h>
#include <readline/history.h>
# undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
# include <readline/readline.h>
# include <readline/history.h>
#endif
#ifdef HAVE_RL_COMPLETION_MATCHES
#define completion_matches(x, y) \