]>
Commit | Line | Data |
---|---|---|
6889aefb ER |
1 | Index: build_tools/menuselect-deps.in |
2 | =================================================================== | |
3 | --- build_tools/menuselect-deps.in (revision 226061) | |
4 | +++ build_tools/menuselect-deps.in (working copy) | |
5 | @@ -17,6 +17,7 @@ | |
6 | IXJUSER=@PBX_IXJUSER@ | |
7 | JACK=@PBX_JACK@ | |
8 | LDAP=@PBX_LDAP@ | |
9 | +LIBEDIT=@PBX_LIBEDIT@ | |
10 | LTDL=@PBX_LTDL@ | |
11 | LUA=@PBX_LUA@ | |
12 | MISDN=@PBX_MISDN@ | |
13 | Index: configure.ac | |
14 | =================================================================== | |
15 | --- configure.ac (revision 226061) | |
16 | +++ configure.ac (working copy) | |
430af958 | 17 | @@ -267,6 +267,7 @@ |
6889aefb ER |
18 | AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet]) |
19 | AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack]) | |
20 | AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap]) | |
21 | +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit]) | |
430af958 | 22 | AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2]) |
6889aefb ER |
23 | AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl]) |
24 | AST_EXT_LIB_SETUP([LUA], [Lua], [lua]) | |
6889aefb ER |
25 | @@ -1593,6 +1594,27 @@ |
26 | AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}]) | |
27 | AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm]) | |
28 | ||
29 | +PBX_LIBEDIT=0 | |
30 | +LIBEDIT_INCLUDE=-Ieditline/readline | |
31 | +LIBEDIT_LIB= | |
32 | +LIBEDIT_OBJ=editline/libedit.a | |
33 | +if test "${USE_LIBEDIT}" != "no"; then | |
34 | + AC_CHECK_TOOL(PKGCONFIG, pkg-config, no) | |
35 | + if test "${PKGCONFIG}" != "no"; then | |
36 | + if ${PKGCONFIG} --exists libedit; then | |
37 | + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) | |
38 | + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) | |
39 | + LIBEDIT_OBJ= | |
40 | + PBX_LIBEDIT=1 | |
41 | + AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.]) | |
42 | + fi | |
43 | + fi | |
44 | +fi | |
45 | +AC_SUBST(PBX_LIBEDIT) | |
46 | +AC_SUBST(LIBEDIT_INCLUDE) | |
47 | +AC_SUBST(LIBEDIT_LIB) | |
48 | +AC_SUBST(LIBEDIT_OBJ) | |
49 | + | |
50 | # possible places for video4linux version 1 | |
51 | AC_CHECK_HEADER([linux/videodev.h], | |
52 | [AC_DEFINE_UNQUOTED([HAVE_VIDEODEV_H], 1, [Define to 1 if your system has linux/videodev.h.])]) | |
539d7b6e ER |
53 | --- main/Makefile~ 2010-04-26 14:11:33.000000000 +0300 |
54 | +++ main/Makefile 2010-04-26 14:14:24.419527855 +0300 | |
6889aefb ER |
55 | @@ -129,6 +129,8 @@ |
56 | $(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm | |
57 | rm ast_expr2.o ast_expr2f.o | |
58 | ||
59 | +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE) | |
60 | + | |
61 | ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) | |
62 | http.o: _ASTCFLAGS+=$(GMIME_INCLUDE) | |
63 | endif | |
539d7b6e | 64 | @@ -176,13 +176,13 @@ |
6889aefb ER |
65 | GMIMELDFLAGS+=$(GMIME_LIB) |
66 | endif | |
67 | ||
68 | -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) | |
69 | +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) | |
70 | @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) | |
71 | $(ECHO_PREFIX) echo " [LD] $^ -> $@" | |
72 | ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) | |
539d7b6e ER |
73 | - $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) |
74 | + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) | |
6889aefb | 75 | else |
539d7b6e ER |
76 | - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) |
77 | + $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) | |
6889aefb ER |
78 | endif |
79 | $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ | |
80 | ||
81 | Index: main/cli.c | |
82 | =================================================================== | |
83 | --- main/cli.c (revision 226061) | |
84 | +++ main/cli.c (working copy) | |
85 | @@ -34,6 +34,8 @@ | |
86 | #include <ctype.h> | |
87 | #include <regex.h> | |
88 | ||
89 | +#include <readline.h> | |
90 | + | |
91 | #include "asterisk/cli.h" | |
92 | #include "asterisk/linkedlists.h" | |
93 | #include "asterisk/module.h" | |
94 | @@ -42,7 +44,6 @@ | |
95 | #include "asterisk/utils.h" | |
96 | #include "asterisk/app.h" | |
97 | #include "asterisk/lock.h" | |
98 | -#include "editline/readline/readline.h" | |
99 | #include "asterisk/threadstorage.h" | |
100 | ||
101 | /*! | |
102 | Index: makeopts.in | |
103 | =================================================================== | |
104 | --- makeopts.in (revision 226061) | |
105 | +++ makeopts.in (working copy) | |
430af958 | 106 | @@ -263,3 +263,8 @@ |
6889aefb ER |
107 | # if poll is not present, let the makefile know. |
108 | POLL_AVAILABLE=@HAS_POLL@ | |
430af958 | 109 | TIMERFD_INCLUDE=@TIMERFD_INCLUDE@ |
6889aefb ER |
110 | + |
111 | +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@ | |
112 | +LIBEDIT_LIB=@LIBEDIT_LIB@ | |
113 | +LIBEDIT_OBJ=@LIBEDIT_OBJ@ | |
430af958 | 114 | + |