[asterisk-commits] russell: trunk r52648 - in /trunk: ./ main/Makefile

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Jan 29 15:37:31 2007
New Revision: 52648

URL: http://svn.digium.com/view/asterisk?view=rev&rev=52648
Log:
Merged revisions 52647 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r52647 | russell | 2007-01-29 15:36:56 -0600 (Mon, 29 Jan 2007) | 3 lines

ASTLDFLAGS needs to be passed to the editline configure script as LDFLAGS.
(issue #8928, zandbelt)

........

Modified:
    trunk/   (props changed)
    trunk/main/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=52648&r1=52647&r2=52648
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Mon Jan 29 15:37:31 2007
@@ -101,7 +101,7 @@
 endif
 
 editline/libedit.a:
-	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(ASTCFLAGS:-Werror=)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
+	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(ASTCFLAGS:-Werror=)" LDFLAGS="$(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: