diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-18 21:54:23 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-18 21:54:23 +0000 |
commit | 0b18c72ed2cec22b08ee8afb0ed6cbb36f31a5a7 (patch) | |
tree | f7cc59334edc4c9d64c48dcbf9c16e4cec19dfc9 /main/Makefile | |
parent | 628965af9875225aebf3b620680fc8eaafadb8fd (diff) |
Ensure that the locations given to the Asterisk configure script for ncurses,
curses, termcap, or tinfo are further passed along to the editline configure
script. This fixes some cross-compilation environments.
(issue #8637, reported by ovi, patch by me)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51262 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
-rw-r--r-- | main/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index c39085e1f..2e64a2843 100644 --- a/main/Makefile +++ b/main/Makefile @@ -95,7 +95,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) + 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) $(MAKE) -C editline libedit.a db1-ast/libdb1.a: @@ -141,6 +141,6 @@ asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) clean:: rm -f asterisk rm -f db1-ast/.*.d - @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi + @if [ -f editline/Makefile ]; then $(MAKE) -C editline clean ; fi @$(MAKE) -C db1-ast clean @$(MAKE) -C stdtime clean |