diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-18 21:57:55 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-18 21:57:55 +0000 |
| commit | 7f1c29e56eb98daa9b2b56cc8d78bd4f9fe72f98 (patch) | |
| tree | f084fc6944f98446e41cf98bf0cf22054900f327 /main/Makefile | |
| parent | 8b6327fe84ac30164ecb53993f45ea7800f2d70e (diff) | |
Merged revisions 51262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51262 | russell | 2007-01-18 15:54:23 -0600 (Thu, 18 Jan 2007) | 5 lines
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/trunk@51263 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 db2aba0a1..a6529e9cf 100644 --- a/main/Makefile +++ b/main/Makefile @@ -100,7 +100,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 |