diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-07-18 14:59:04 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-07-18 14:59:04 +0000 |
| commit | fa50e539f9931b22ab697e362ddf74afcaf3d511 (patch) | |
| tree | b04d75cb5f921daf7e0a9fc9511f97058df7873a /mk/readline.builtin.mk | |
| parent | 892f1155cd69c9cd5fde27913ad4d537952eefcc (diff) | |
| download | pkgsrc-fa50e539f9931b22ab697e362ddf74afcaf3d511.tar.gz | |
Fix non-editline builtin case.
Many thanks for obache@.
* READLINE_DEFAULT is depends on builtin editline/readline type if possible.
* _READLINE_ACCEPTED is always "editline readline", both are provided.
Tested on OmniOS (builtin readline-6.2; with some modifications) and NetBSD.
XXX If buitin readline is incompatible, READLINE_DEFAULT is set as readline.
According to devel/readline/builtin.mk, SunOS, Darwin, and Interix's
readline is incompatible with GNU readline.
This behavior should be fixed.
Diffstat (limited to 'mk/readline.builtin.mk')
| -rw-r--r-- | mk/readline.builtin.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/readline.builtin.mk b/mk/readline.builtin.mk index e9093aae90e..226eb80e70f 100644 --- a/mk/readline.builtin.mk +++ b/mk/readline.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: readline.builtin.mk,v 1.1 2013/07/15 01:54:25 ryoon Exp $ +# $NetBSD: readline.builtin.mk,v 1.2 2013/07/18 14:59:04 ryoon Exp $ # BUILTIN_PKG:= editlinereadline @@ -15,14 +15,16 @@ BUILTIN_FIND_GREP.H_READLINE= \#define[ ]*RL_VERSION_MAJOR .include "../../mk/buildlink3/bsd.builtin.mk" .if !defined(IS_BUILTIN.editlinereadline) -IS_BUILTIN.readline= no +IS_BUILTIN.editlinereadline= no . if empty(H_READLINE:M__nonexistent__) && \ empty(H_READLINE:M${LOCALBASE}/*) && \ !empty(BUILTIN_LIB_FOUND.readline:M[yY][eE][sS]) +IS_BUILTIN.readline= yes IS_BUILTIN.editlinereadline= yes . else if empty(_BLTN_H_READLINE:M__nonexistent__) && \ !empty(BUILTIN_LIB_FOUND.readline:M[nN][oO]) && \ !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) +IS_BUILTIN.editline= yes IS_BUILTIN.editlinereadline= yes . endif .endif |