[svn-commits] seanbright: branch seanbright/editline-update r253110 - in /team/seanbright/e...

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Mar 17 08:32:27 2010
New Revision: 253110

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253110
Log:
Fix include paths for the main asterisk binary.

Modified:
    team/seanbright/editline-update/configure
    team/seanbright/editline-update/configure.ac
    team/seanbright/editline-update/main/Makefile
    team/seanbright/editline-update/main/asterisk.c

Modified: team/seanbright/editline-update/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/configure.ac?view=diff&rev=253110&r1=253109&r2=253110
==============================================================================
--- team/seanbright/editline-update/configure.ac (original)
+++ team/seanbright/editline-update/configure.ac Wed Mar 17 08:32:27 2010
@@ -1818,10 +1818,10 @@
 AC_SUBST(GTK2_LIB)
 
 PBX_LIBEDIT=0
-LIBEDIT_INCLUDE=-Ieditline/src/editline
+LIBEDIT_INCLUDE="-Ieditline/src -Ieditline/src/editline"
 LIBEDIT_LIB=
 LIBEDIT_OBJ=editline-build/install/usr/local/lib/libedit.a
-if test  "${USE_LIBEDIT}" != "no"; then
+if test "${USE_LIBEDIT}" != "no"; then
    AC_CHECK_TOOL(PKGCONFIG, pkg-config, no)
    if test "${PKGCONFIG}" != "no"; then
       if ${PKGCONFIG} --exists libedit; then

Modified: team/seanbright/editline-update/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/main/Makefile?view=diff&rev=253110&r1=253109&r2=253110
==============================================================================
--- team/seanbright/editline-update/main/Makefile (original)
+++ team/seanbright/editline-update/main/Makefile Wed Mar 17 08:32:27 2010
@@ -138,6 +138,8 @@
 	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
 	rm ast_expr2.o ast_expr2f.o
 
+asterisk.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
+
 cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
 
 ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)

Modified: team/seanbright/editline-update/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/main/asterisk.c?view=diff&rev=253110&r1=253109&r2=253110
==============================================================================
--- team/seanbright/editline-update/main/asterisk.c (original)
+++ team/seanbright/editline-update/main/asterisk.c Wed Mar 17 08:32:27 2010
@@ -107,6 +107,8 @@
 #endif /* HAVE_CAP */
 #endif /* linux */
 
+#include <histedit.h>
+
 #include "asterisk/paths.h"	/* we define here the variables so better agree on the prototype */
 #include "asterisk/network.h"
 #include "asterisk/cli.h"
@@ -130,7 +132,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/io.h"
-#include "editline/src/histedit.h"
 #include "asterisk/config.h"
 #include "asterisk/ast_version.h"
 #include "asterisk/linkedlists.h"