Merged revisions 301221 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301221 | pabelanger | 2011-01-09 16:40:34 -0500 (Sun, 09 Jan 2011) | 21 lines

  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/trunk@301222 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4
index a9f1d6c..16b2931 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 1a247b4..c2d3897 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 298961 .
+# From configure.ac Revision: 299754 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for asterisk trunk.
 #
@@ -10928,7 +10928,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
@@ -10936,7 +10936,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 447580f..01c36bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -435,7 +435,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])