diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2012-07-25 12:21:54 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2012-07-25 12:21:54 +0000 |
| commit | 7d4ccea736c1ce325de00c23dee28c61de47e638 (patch) | |
| tree | 70bf7912bb022d6c064a75e7a49e60e9d9e61ecb /main/editline | |
| parent | 38f1081fd396e39e0c02600a5d58080880838131 (diff) | |
Enable usage of system-provided NetBSD editline library if available.
This patch changes the Asterisk configure script and build system to detect
the presence of the NetBSD editline library (libedit) on the system. If it is
found, it will be used in preference to the version included in the Asterisk
source tree.
(closes issue ASTERISK-18725)
Reported by: Jeffrey C. Ollie
Review: https://reviewboard.asterisk.org/r/1528/
Patches:
0001-Allow-linking-building-against-an-external-editline.patch uploaded by jcollie (license #5373) (heavily modified by kpfleming)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/editline')
| -rwxr-xr-x | main/editline/configure | 2 | ||||
| -rw-r--r-- | main/editline/configure.in | 2 | ||||
| -rw-r--r-- | main/editline/readline.c | 2 | ||||
| -rw-r--r-- | main/editline/readline.h (renamed from main/editline/readline/readline.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/main/editline/configure b/main/editline/configure index b5fc6e02c..d5d0a4dea 100755 --- a/main/editline/configure +++ b/main/editline/configure @@ -2031,7 +2031,7 @@ TCSRCS="TEST/test.c" if test "x$enable_readline" = "xyes" ; then CCSRCS="$CCSRCS readline.c" - IHDRS="$IHDRS readline/readline.h" + IHDRS="$IHDRS readline.h" IHDR_LINKS="readline.h readline/history.h" HDR_DIRS="$HDR_DIRS include/readline" LIB_A_LINKS="$LIB_A_LINKS libedit.a libreadline.a" diff --git a/main/editline/configure.in b/main/editline/configure.in index db533343d..d8bc706b1 100644 --- a/main/editline/configure.in +++ b/main/editline/configure.in @@ -235,7 +235,7 @@ TCSRCS="TEST/test.c" dnl Add files to the lists if readline compatibility is enabled. if test "x$enable_readline" = "xyes" ; then CCSRCS="$CCSRCS readline.c" - IHDRS="$IHDRS readline/readline.h" + IHDRS="$IHDRS readline.h" IHDR_LINKS="readline.h readline/history.h" HDR_DIRS="$HDR_DIRS include/readline" LIB_A_LINKS="$LIB_A_LINKS libedit.a libreadline.a" diff --git a/main/editline/readline.c b/main/editline/readline.c index 77827c3f9..adf054d63 100644 --- a/main/editline/readline.c +++ b/main/editline/readline.c @@ -58,7 +58,7 @@ __RCSID("$NetBSD: readline.c,v 1.21 2002/03/18 16:20:36 christos Exp $"); #endif #include "histedit.h" -#include "readline/readline.h" +#include "readline.h" #include "el.h" #include "fcns.h" /* for EL_NUM_FCNS */ diff --git a/main/editline/readline/readline.h b/main/editline/readline.h index 7485dde40..7485dde40 100644 --- a/main/editline/readline/readline.h +++ b/main/editline/readline.h |