[asterisk-commits] qwell: branch 11 r385356 - in /branches/11: ./ build_tools/ include/asterisk/...

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Apr 11 14:59:35 2013
New Revision: 385356

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385356
Log:
Add dependency on libuuid, for res_rtp_asterisk

pjproject is what actually requires libuuid.

(closes issue ASTERISK-21125)
reported by Private Name

(Ed. note: Really?  Private Name?  I am rolling my eyes so hard right now.)

Modified:
    branches/11/build_tools/menuselect-deps.in
    branches/11/configure
    branches/11/configure.ac
    branches/11/include/asterisk/autoconfig.h.in
    branches/11/makeopts.in
    branches/11/res/res_rtp_asterisk.c

Modified: branches/11/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/branches/11/build_tools/menuselect-deps.in?view=diff&rev=385356&r1=385355&r2=385356
==============================================================================
--- branches/11/build_tools/menuselect-deps.in (original)
+++ branches/11/build_tools/menuselect-deps.in Thu Apr 11 14:59:35 2013
@@ -63,6 +63,7 @@
 SYSLOG=@PBX_SYSLOG@
 TONEZONE=@PBX_TONEZONE@
 UNIXODBC=@PBX_UNIXODBC@
+UUID=@PBX_UUID@
 VORBIS=@PBX_VORBIS@
 VPB=@PBX_VPB@
 WINARCH=@PBX_WINARCH@

Modified: branches/11/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/11/configure.ac?view=diff&rev=385356&r1=385355&r2=385356
==============================================================================
--- branches/11/configure.ac (original)
+++ branches/11/configure.ac Thu Apr 11 14:59:35 2013
@@ -474,6 +474,7 @@
 AST_EXT_LIB_SETUP([TINFO], [Term Info], [tinfo])
 AST_EXT_LIB_SETUP([TONEZONE], [tonezone], [tonezone])
 AST_EXT_LIB_SETUP([UNIXODBC], [unixODBC], [unixodbc])
+AST_EXT_LIB_SETUP([UUID], [UUID], [uuid])
 AST_EXT_LIB_SETUP([VORBIS], [Vorbis], [vorbis])
 AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb])
 AST_EXT_LIB_SETUP([X11], [X11], [x11])
@@ -2200,6 +2201,8 @@
 
 AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra} ${DAHDI_INCLUDE}])
 
+AST_EXT_LIB_CHECK([UUID], [uuid], [uuid_generate_random], [uuid/uuid.h])
+
 if test "${OSARCH}" = "OpenBSD";
 then
 	AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -lvorbisfile -logg])

Modified: branches/11/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/11/include/asterisk/autoconfig.h.in?view=diff&rev=385356&r1=385355&r2=385356
==============================================================================
--- branches/11/include/asterisk/autoconfig.h.in (original)
+++ branches/11/include/asterisk/autoconfig.h.in Thu Apr 11 14:59:35 2013
@@ -1015,6 +1015,9 @@
 
 /* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
 #undef HAVE_UTIME_NULL
+
+/* Define to 1 if you have the UUID library. */
+#undef HAVE_UUID
 
 /* Define to 1 if your system can support larger than default select bitmasks.
    */
@@ -1226,11 +1229,6 @@
 /* Define to 1 if running on Darwin. */
 #undef _DARWIN_UNLIMITED_SELECT
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 

Modified: branches/11/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/branches/11/makeopts.in?view=diff&rev=385356&r1=385355&r2=385356
==============================================================================
--- branches/11/makeopts.in (original)
+++ branches/11/makeopts.in Thu Apr 11 14:59:35 2013
@@ -283,6 +283,9 @@
 UNIXODBC_INCLUDE=@UNIXODBC_INCLUDE@
 UNIXODBC_LIB=@UNIXODBC_LIB@
 
+UUID_INCLUDE=@UUID_INCLUDE@
+UUID_LIB=@UUID_LIB@
+
 VORBIS_INCLUDE=@VORBIS_INCLUDE@
 VORBIS_LIB=@VORBIS_LIB@
 

Modified: branches/11/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/res/res_rtp_asterisk.c?view=diff&rev=385356&r1=385355&r2=385356
==============================================================================
--- branches/11/res/res_rtp_asterisk.c (original)
+++ branches/11/res/res_rtp_asterisk.c Thu Apr 11 14:59:35 2013
@@ -29,6 +29,7 @@
  */
 
 /*** MODULEINFO
+	<depend>uuid</depend>
 	<support_level>core</support_level>
  ***/