From 8399112981a0417f9e38c2919753d960a9d1a14a Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 29 Aug 2007 15:57:29 +0000 Subject: [PATCH] If chan_h323 is not being built, don't use g++ to do the final link of Asterisk. (in response to a question on the asterisk-dev list) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81342 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main/Makefile b/main/Makefile index ff2e67753c..dd2c97e405 100644 --- a/main/Makefile +++ b/main/Makefile @@ -135,7 +135,11 @@ asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) @rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" +ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) +else $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) +endif @$(ASTTOPDIR)/build_tools/strip_nonapi $@ clean::