[asterisk-commits] twilson: branch group/srtp_reboot r266290 - in /team/group/srtp_reboot: ./ in...

Fri May 28 12:48:09 CDT 2010

Author: twilson
Date: Fri May 28 12:48:07 2010
New Revision: 266290

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=266290
Log:
Merged revisions 266289 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r266289 | twilson | 2010-05-28 12:34:00 -0500 (Fri, 28 May 2010) | 2 lines
  
  More build fixes for ical/neon and res_calendar_ews
........

Modified:
    team/group/srtp_reboot/   (props changed)
    team/group/srtp_reboot/configure
    team/group/srtp_reboot/configure.ac
    team/group/srtp_reboot/include/asterisk/autoconfig.h.in
    team/group/srtp_reboot/makeopts.in

Propchange: team/group/srtp_reboot/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 28 12:48:07 2010
@@ -1,1 +1,1 @@
-/trunk:1-266247
+/trunk:1-266289

Modified: team/group/srtp_reboot/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/configure.ac?view=diff&rev=266290&r1=266289&r2=266290
==============================================================================
--- team/group/srtp_reboot/configure.ac (original)
+++ team/group/srtp_reboot/configure.ac Fri May 28 12:48:07 2010
@@ -926,7 +926,7 @@
 # Some distributions (like RedHat) add a libical subdirectory for the headers
 AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_get_utc_timezone], [libical/ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
 if test x"${PBX_ICAL}" = x1; then
-	ICAL_INCLUDE+=-I/usr/include/libical
+	ICAL_INCLUDE+=" -I/usr/include/libical"
 fi
 
 AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])

Modified: team/group/srtp_reboot/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/include/asterisk/autoconfig.h.in?view=diff&rev=266290&r1=266289&r2=266290
==============================================================================
--- team/group/srtp_reboot/include/asterisk/autoconfig.h.in (original)
+++ team/group/srtp_reboot/include/asterisk/autoconfig.h.in Fri May 28 12:48:07 2010
@@ -773,7 +773,7 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1041,11 +1041,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. */
@@ -1065,11 +1065,6 @@
 
 /* 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
@@ -1100,20 +1095,30 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* 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.  */
+#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
+
+
+/* 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
@@ -1130,20 +1135,6 @@
 
 /* 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
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* 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

Modified: team/group/srtp_reboot/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/makeopts.in?view=diff&rev=266290&r1=266289&r2=266290
==============================================================================
--- team/group/srtp_reboot/makeopts.in (original)
+++ team/group/srtp_reboot/makeopts.in Fri May 28 12:48:07 2010
@@ -150,6 +150,8 @@
 
 NEON_INCLUDE=@NEON_INCLUDE@
 NEON_LIB=@NEON_LIB@
+NEON29_INCLUDE=@NEON_INCLUDE@
+NEON29_LIB=@NEON_LIB@
 
 NETSNMP_INCLUDE=@NETSNMP_INCLUDE@
 NETSNMP_LIB=@NETSNMP_LIB@


