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 /build_tools | |
| 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 'build_tools')
| -rw-r--r-- | build_tools/cflags.xml | 4 | ||||
| -rwxr-xr-x | build_tools/make_buildopts_h | 4 | ||||
| -rw-r--r-- | build_tools/menuselect-deps.in | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index b49974797..ece1e0d53 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -1,6 +1,10 @@ <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean"> <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler"> </member> + <member name="ENABLE_UPLOADS" displayname="Enable HTTP uploads"> + <defaultenabled>yes</defaultenabled> + <depend>gmime</depend> + </member> <member name="DEBUG_THREADS" displayname="Enable Thread Debugging"> </member> <member name="STATIC_BUILD" displayname="Build static binaries"> diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index ace404555..00b3eeded 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -7,11 +7,11 @@ cat << END */ END -TMP=`${GREP} MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'` +TMP=`${GREP} -e ^MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'` for x in ${TMP}; do echo "#define ${x} 1" done -TMP=`${GREP} MENUSELECT_BUILD_DEPS menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'` +TMP=`${GREP} -e ^MENUSELECT_BUILD_DEPS menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'` for x in ${TMP}; do x2=`echo ${x} | tr a-z A-Z` echo "#define AST_MODULE_${x2} 1" diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 80eaf7d4b..f724fe3ae 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -2,6 +2,7 @@ ASOUND=@PBX_ALSA@ CRYPTO=@PBX_CRYPTO@ CURL=@PBX_CURL@ FREETDS=@PBX_FREETDS@ +GMIME=@PBX_GMIME@ GNU_LD=@GNU_LD@ GSM=@PBX_GSM@ GTK2=@PBX_GTK2@ |