diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-17 22:24:46 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-17 22:24:46 +0000 |
| commit | 4e4e469f448b34e03fb1c1988e26ede031a70f11 (patch) | |
| tree | ed83274c4ccceadfd81d763a8c744f68f41589b1 /main/Makefile | |
| parent | 4987488116711ce8e10eede0812cfc8a26ada0e4 (diff) | |
Merged revisions 109229 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r109229 | twilson | 2008-03-17 17:10:06 -0500 (Mon, 17 Mar 2008) | 5 lines
Replace minimime with superior GMime library so that the entire contents of an http post are not read into memory.
This does introduce a dependency on the GMime library for handling HTTP POSTs, but it is available in most distros.
If the library is present, then the compile flag for ENABLE_UPLOADS is enabled by default in menuselect.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@109254 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/main/Makefile b/main/Makefile index 91e878344..b24e19e81 100644 --- a/main/Makefile +++ b/main/Makefile @@ -132,6 +132,11 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) + +ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) +http.o: ASTCFLAGS+=$(GMIME_INCLUDE) +endif + stdtime/localtime.o: ASTCFLAGS+=$(AST_NO_STRICT_OVERFLOW) AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS)) @@ -146,9 +151,6 @@ else H323LDLIBS= endif -minimime/libmmime.a: CHECK_SUBDIR - @cd minimime && $(MAKE) libmmime.a - ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) MAIN_TGT:=asterisk.dll asterisk: cygload @@ -159,13 +161,17 @@ else MAIN_TGT:=asterisk endif -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS) +ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) +GMIMELDFLAGS+=$(GMIME_LIB) +endif + +$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) @$(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) + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) else - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) + $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) endif $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ @@ -175,5 +181,4 @@ clean:: @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi @$(MAKE) -C db1-ast clean @$(MAKE) -C stdtime clean - @$(MAKE) -C minimime clean rm -f libresample/src/*.o |