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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@301220 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4
index df65a1352ec5d256e4cee4ad790bcb3f4e37acfd..f0b8909b1afd6ba633dc9a3744202a6ad18deeeb 100644 (file)
--- 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)
 ])
 

diff --git a/configure b/configure
index 3d3c4379c84bcdfde69a4fbf6ad475144ea15044..847b35d264340db559dec9f8daf21c1784b1e23c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 298817 .
+# From configure.ac Revision: 298957 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for asterisk 1.6.2.
 #
@@ -10157,7 +10157,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
@@ -10165,7 +10165,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 99beb3232b3a98909a93fffcaf1150f4d84b16d5..d3af0fa98679166e0fa13c67ae886d0d30f67507 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,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])