[svn-commits] pabelanger: trunk r301222 - in /trunk: ./ autoconf/

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Sun Jan  9 15:42:47 2011
New Revision: 301222

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301222
Log:
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/
  ........
................

Modified:
    trunk/   (props changed)
    trunk/autoconf/ast_ext_lib.m4
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/autoconf/ast_ext_lib.m4
URL: http://svnview.digium.com/svn/asterisk/trunk/autoconf/ast_ext_lib.m4?view=diff&rev=301222&r1=301221&r2=301222
==============================================================================
--- trunk/autoconf/ast_ext_lib.m4 (original)
+++ trunk/autoconf/ast_ext_lib.m4 Sun Jan  9 15:42:47 2011
@@ -54,7 +54,7 @@
 		;;
 	esac
 	],
-	[m4_ifval($4, [$2="$4"])])
+	[m4_ifval($4, [$2="$4"], [:])])
 AC_SUBST($2)
 ])
 

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=301222&r1=301221&r2=301222
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Jan  9 15:42:47 2011
@@ -435,7 +435,7 @@
 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])