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

[SVN commits to the Digium repositories]

Author: seanbright
Date: Mon Mar 22 12:25:03 2010
New Revision: 253746

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253746
Log:
Since we changed back to the original library, get us building again.

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

Modified: team/seanbright/editline-update/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/configure.ac?view=diff&rev=253746&r1=253745&r2=253746
==============================================================================
--- team/seanbright/editline-update/configure.ac (original)
+++ team/seanbright/editline-update/configure.ac Mon Mar 22 12:25:03 2010
@@ -1821,9 +1821,9 @@
 AC_SUBST(GTK2_LIB)
 
 PBX_LIBEDIT=0
-LIBEDIT_INCLUDE="-Ieditline/src -Ieditline/src/editline"
+LIBEDIT_INCLUDE="-Ieditline -Ieditline/readline"
 LIBEDIT_LIB=
-LIBEDIT_OBJ=editline-build/install/usr/local/lib/libedit.a
+LIBEDIT_OBJ=editline/libedit.a
 if test "${USE_LIBEDIT}" != "no"; then
    AC_CHECK_TOOL(PKGCONFIG, pkg-config, no)
    if test "${PKGCONFIG}" != "no"; then

Modified: team/seanbright/editline-update/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/main/Makefile?view=diff&rev=253746&r1=253745&r2=253746
==============================================================================
--- team/seanbright/editline-update/main/Makefile (original)
+++ team/seanbright/editline-update/main/Makefile Mon Mar 22 12:25:03 2010
@@ -97,14 +97,9 @@
 
 CHECK_SUBDIR:	# do nothing, just make sure that we recurse in the subdir/
 
-editline-build/install/usr/local/lib/libedit.a: CHECK_SUBDIR
-	if [ ! -d editline-build ]; then \
-		mkdir editline-build ; \
-	fi ; \
-	cd editline-build ; \
-	CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ../editline/configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-static=yes --enable-shared=no ; \
-	$(MAKE) ; \
-	$(MAKE) DESTDIR=`pwd`/install install ;
+editline/libedit.a: CHECK_SUBDIR
+	cd editline && CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
+	$(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a: CHECK_SUBDIR
 	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a