diff -Naurp asterisk-1.6.1-beta3/build_tools/menuselect-deps.in asterisk-1.6.1-beta3.oden/build_tools/menuselect-deps.in --- asterisk-1.6.1-beta3/build_tools/menuselect-deps.in 2008-08-03 18:14:14.000000000 +0200 +++ asterisk-1.6.1-beta3.oden/build_tools/menuselect-deps.in 2008-12-11 14:55:04.000000000 +0100 @@ -17,6 +17,7 @@ ISDNNET=@PBX_ISDNNET@ IXJUSER=@PBX_IXJUSER@ JACK=@PBX_JACK@ LDAP=@PBX_LDAP@ +LIBEDIT=@PBX_LIBEDIT@ LTDL=@PBX_LTDL@ LUA=@PBX_LUA@ MISDN=@PBX_MISDN@ diff -Naurp asterisk-1.6.1-beta3/configure.ac asterisk-1.6.1-beta3.oden/configure.ac --- asterisk-1.6.1-beta3/configure.ac 2008-12-01 22:46:26.000000000 +0100 +++ asterisk-1.6.1-beta3.oden/configure.ac 2008-12-11 14:55:04.000000000 +0100 @@ -228,6 +228,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP To AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet]) AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack]) AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap]) +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit]) AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl]) AST_EXT_LIB_SETUP([LUA], [Lua], [lua]) AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn]) @@ -1585,6 +1586,27 @@ AC_SUBST(PBX_GTK2) AC_SUBST(GTK2_INCLUDE) AC_SUBST(GTK2_LIB) +PBX_LIBEDIT=0 +LIBEDIT_INCLUDE=-Ieditline/readline +LIBEDIT_LIB= +LIBEDIT_OBJ=editline/libedit.a +if test "${USE_LIBEDIT}" != "no"; then + AC_CHECK_TOOL(PKGCONFIG, pkg-config, no) + if test "${PKGCONFIG}" != "no"; then + if ${PKGCONFIG} --exists libedit; then + LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags) + LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs) + LIBEDIT_OBJ= + PBX_LIBEDIT=1 + AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.]) + fi + fi +fi +AC_SUBST(PBX_LIBEDIT) +AC_SUBST(LIBEDIT_INCLUDE) +AC_SUBST(LIBEDIT_LIB) +AC_SUBST(LIBEDIT_OBJ) + if test "${USE_CURL}" != "no"; then AC_PATH_TOOL([CURL_CONFIG], [curl-config], No) if test ! x"${CURL_CONFIG}" = xNo; then diff -Naurp asterisk-1.6.1-beta3/include/asterisk/autoconfig.h.in asterisk-1.6.1-beta3.oden/include/asterisk/autoconfig.h.in --- asterisk-1.6.1-beta3/include/asterisk/autoconfig.h.in 2008-11-25 06:05:18.000000000 +0100 +++ asterisk-1.6.1-beta3.oden/include/asterisk/autoconfig.h.in 2008-12-11 14:56:19.000000000 +0100 @@ -407,6 +407,9 @@ /* Define to indicate the ${LDAP_DESCRIP} library version */ #undef HAVE_LDAP_VERSION +/* Define if your system has the NetBSD Editline libraries. */ +#undef HAVE_LIBEDIT + /* Define to 1 if you have the <libintl.h> header file. */ #undef HAVE_LIBINTL_H diff -Naurp asterisk-1.6.1-beta3/main/cli.c asterisk-1.6.1-beta3.oden/main/cli.c --- asterisk-1.6.1-beta3/main/cli.c 2008-10-09 17:06:21.000000000 +0200 +++ asterisk-1.6.1-beta3.oden/main/cli.c 2008-12-11 14:55:04.000000000 +0100 @@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi #include <ctype.h> #include <regex.h> +#include <readline.h> + #include "asterisk/cli.h" #include "asterisk/linkedlists.h" #include "asterisk/module.h" @@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi #include "asterisk/utils.h" #include "asterisk/app.h" #include "asterisk/lock.h" -#include "editline/readline/readline.h" #include "asterisk/threadstorage.h" /*! diff -Naurp asterisk-1.6.1-beta3/main/Makefile asterisk-1.6.1-beta3.oden/main/Makefile --- asterisk-1.6.1-beta3/main/Makefile 2008-11-29 19:16:50.000000000 +0100 +++ asterisk-1.6.1-beta3.oden/main/Makefile 2008-12-11 14:55:04.000000000 +0100 @@ -129,6 +129,8 @@ $(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm rm ast_expr2.o ast_expr2f.o +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE) + ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) http.o: _ASTCFLAGS+=$(GMIME_INCLUDE) endif @@ -161,13 +163,13 @@ GMIMELDFLAGS+=$(GMIME_LIB) endif -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) $(ECHO_PREFIX) echo " [LD] $^ -> $@" ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) - $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) else - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) + $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) endif $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ --- asterisk-1.6.1-beta3/makeopts.in 2008-11-29 19:16:50.000000000 +0100 +++ asterisk-1.6.1-beta3.oden/makeopts.in 2008-12-11 14:55:04.000000000 +0100 @@ -246,3 +246,7 @@ TINFO_DIR=@TINFO_DIR@ # if poll is not present, let the makefile know. POLL_AVAILABLE=@HAS_POLL@ + +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@ +LIBEDIT_LIB=@LIBEDIT_LIB@ +LIBEDIT_OBJ=@LIBEDIT_OBJ@