From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Sun, 9 Jan 2011 21:40:34 +0000 (+0000)
Subject: Merged revisions 301220 via svnmerge from
X-Git-Tag: 1.8.3-rc1~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30ff299d39df3d8edbede2cd996c160536191391;p=thirdparty%2Fasterisk.git

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

diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4
index a9f1d6cda4..16b2931a6e 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)
 ])
 
diff --git a/configure b/configure
index 99fd5fc4c7..a8173eba63 100755
--- a/configure
+++ b/configure
@@ -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 9a09e6c326..a17c7b7873 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])