diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 15:57:29 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 15:57:29 +0000 |
| commit | dcddecbb45eae0b9757adf65ce8733b09dde832a (patch) | |
| tree | 44f5b41989de726c4d1761b8c404d169a444a67a /main | |
| parent | 47beeb2ede00ca09b75e9d2ed3bece756bd81086 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@81342 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/Makefile b/main/Makefile index ff2e67753..dd2c97e40 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:: |