[asterisk-commits] lmadsen: tag 1.8.2 r301494 - in /tags/1.8.2: ./ autoconf/ include/asterisk/

Wed Jan 12 10:52:36 CST 2011

Author: lmadsen
Date: Wed Jan 12 10:52:31 2011
New Revision: 301494

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301494
Log:

------------------------------------------------------------------------
r301221 | pabelanger | 2011-01-09 15:40:35 -0600 (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 0018589)
  Reported by: pabelanger
  Patches:
        issue18589.patch uploaded by pabelanger (license 224)
        Tested by: pabelanger
  
  Review: https://reviewboard.asterisk.org/r/1074/ [^]
........

------------------------------------------------------------------------

Modified:
    tags/1.8.2/autoconf/ast_ext_lib.m4
    tags/1.8.2/configure
    tags/1.8.2/configure.ac
    tags/1.8.2/include/asterisk/autoconfig.h.in

Modified: tags/1.8.2/autoconf/ast_ext_lib.m4
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.2/autoconf/ast_ext_lib.m4?view=diff&rev=301494&r1=301493&r2=301494
==============================================================================

--- tags/1.8.2/autoconf/ast_ext_lib.m4 (original)
+++ tags/1.8.2/autoconf/ast_ext_lib.m4 Wed Jan 12 10:52:31 2011
@@ -54,7 +54,7 @@
 		;;
 	esac
 	],
-	[m4_ifval($4, [$2="$4"])])
+	[m4_ifval($4, [$2="$4"], [:])])
 AC_SUBST($2)
 ])
 

Modified: tags/1.8.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.2/configure.ac?view=diff&rev=301494&r1=301493&r2=301494
==============================================================================
--- tags/1.8.2/configure.ac (original)
+++ tags/1.8.2/configure.ac Wed Jan 12 10:52:31 2011
@@ -431,7 +431,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])

Modified: tags/1.8.2/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.2/include/asterisk/autoconfig.h.in?view=diff&rev=301494&r1=301493&r2=301494
==============================================================================
--- tags/1.8.2/include/asterisk/autoconfig.h.in (original)
+++ tags/1.8.2/include/asterisk/autoconfig.h.in Wed Jan 12 10:52:31 2011
@@ -813,16 +813,16 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
 
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is member of `struct ucred'. */
 #undef HAVE_STRUCT_UCRED_CR_UID
 
-/* Define to 1 if `uid' is a member of `struct ucred'. */
+/* Define to 1 if `uid' is member of `struct ucred'. */
 #undef HAVE_STRUCT_UCRED_UID
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1097,11 +1097,11 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
+
+/* Define to 1 if the C compiler supports function prototypes. */
+#undef PROTOTYPES
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -1121,6 +1121,11 @@
 
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
+
+/* Define to 1 if the `setvbuf' function takes the buffering type as its
+   second argument and the buffer pointer as the third, as on System V before
+   release 3. */
+#undef SETVBUF_REVERSED
 
 /* The size of `char *', as computed by sizeof. */
 #undef SIZEOF_CHAR_P
@@ -1157,49 +1162,53 @@
 /* Define to a type of the same size as fd_set.fds_bits[[0]] */
 #undef TYPEOF_FD_SET_FDS_BITS
 
-/* Enable extensions on AIX 3, Interix.  */
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
+
+/* Define to 1 if running on Darwin. */
+#undef _DARWIN_UNLIMITED_SELECT
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable threading extensions on Solaris.  */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
-/* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Define to 1 if running on Darwin. */
-#undef _DARWIN_UNLIMITED_SELECT
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
+
+/* Define like PROTOTYPES; this can be used by system headers. */
+#undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const


