aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-08 15:24:52 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-08 15:24:52 +0000
commitc4a6d12d562074ed223102f0ff0a1dcd4a475a24 (patch)
tree51f50e1c87acdd66d06b44274d14da301f4c352c /Makefile
parent4017232235153691044d12c50e759e05607a5da0 (diff)
add smarter checking for termcap support, which fixes a build problem when
ncurses is statically compiled with term info support, which is provided in the statically compiled editline library that we are including. (issue #6948, original patch by casper, modified to use the features of AST_EXT_LIB) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@25611 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 628fab60e..87c9bfdca 100644
--- a/Makefile
+++ b/Makefile
@@ -365,9 +365,9 @@ ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
endif
ifeq ($(OSARCH),Linux)
- LIBS+=-ldl -lpthread -lncurses -lm -lresolv #-lnjamd
+ LIBS+=-ldl -lpthread $(EDITLINE_LIBS) -lm -lresolv #-lnjamd
else
- LIBS+=-lncurses -lm
+ LIBS+=$(EDITLINE_LIBS) -lm
endif
ifeq ($(OSARCH),Darwin)
@@ -395,11 +395,11 @@ ifeq ($(OSARCH),FreeBSD)
endif
ifeq ($(OSARCH),NetBSD)
- LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib -lncurses
+ LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib $(EDITLINE_LIBS)
endif
ifeq ($(OSARCH),OpenBSD)
- LIBS+=-lcrypto -lpthread -lm -lncurses
+ LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIBS)
endif
ifeq ($(OSARCH),SunOS)