From: Russell Bryant Date: Mon, 29 Jan 2007 21:37:31 +0000 (+0000) Subject: Merged revisions 52647 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~3339 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dfed82cb9946942c2d4347d063c7b45e4c6de98;p=thirdparty%2Fasterisk.git 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) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52648 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/Makefile b/main/Makefile index 401d870282..a6adff763e 100644 --- a/main/Makefile +++ b/main/Makefile @@ -101,7 +101,7 @@ ifeq ($(OSARCH),SunOS) 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: