diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-09 21:40:34 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-09 21:40:34 +0000 |
| commit | 6d1c333e2700dde40b0cc893b6e2c05eee7af3f3 (patch) | |
| tree | 35196c58fd20b1986969febb1e9ef7b95b916986 | |
| parent | 9f022f96cb90436c502ee153bc0ebbb3becb2d92 (diff) | |
Merged revisions 301220 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r301220 | pabelanger | 2011-01-09 16:38:24 -0500 (Sun, 09 Jan 2011) | 14 lines
SOUND_CACHE_DIR now defaults to empty
Sounds files included in the Asterisk tarball were being ignored and
re-downloaded. Users wanting to cache the files can still override the setting
using the --with-sounds-cache option.
(closes issue #18589)
Reported by: pabelanger
Patches:
issue18589.patch uploaded by pabelanger (license 224)
Tested by: pabelanger
Review: https://reviewboard.asterisk.org/r/1074/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@301221 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | autoconf/ast_ext_lib.m4 | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4 index a9f1d6cda..16b2931a6 100644 --- a/autoconf/ast_ext_lib.m4 +++ b/autoconf/ast_ext_lib.m4 @@ -54,7 +54,7 @@ AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH], [use $3 in PATH]), ;; esac ], - [m4_ifval($4, [$2="$4"])]) + [m4_ifval($4, [$2="$4"], [:])]) AC_SUBST($2) ]) @@ -10925,7 +10925,7 @@ if test "${with_sounds_cache+set}" = set; then : ;; *) if test "x${withval}" = "x"; then - SOUNDS_CACHE_DIR="${HOME}/.asterisk_sounds_cache" + : else SOUNDS_CACHE_DIR="${withval}" fi @@ -10933,7 +10933,7 @@ if test "${with_sounds_cache+set}" = set; then : esac else - SOUNDS_CACHE_DIR="${HOME}/.asterisk_sounds_cache" + : fi diff --git a/configure.ac b/configure.ac index 9a09e6c32..a17c7b787 100644 --- a/configure.ac +++ b/configure.ac @@ -432,7 +432,7 @@ AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius]) AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample]) AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl]) AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image], [SDL_image]) -AST_OPTION_ONLY([sounds-cache], [SOUNDS_CACHE_DIR], [cached sound tarfiles], [${HOME}/.asterisk_sounds_cache]) +AST_OPTION_ONLY([sounds-cache], [SOUNDS_CACHE_DIR], [cached sound tarfiles], []) AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp]) AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7]) AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex]) |