mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 11:58:52 +00:00
Ensure that libneon > 0.29.0 is installed for res_calendar_ews
This uses a modified version of pabelanger's patch that checks for NTLM support instead, which was added in 0.29.0 which is what is required for res_calendar_ews. (closes issue #17391) Reported by: loloski Patches: issue17391.patch.v2 uploaded by pabelanger (license 224) Tested by: twilson git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@265793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -32,6 +32,7 @@ NBS=@PBX_NBS@
|
|||||||
NETSNMP=@PBX_NETSNMP@
|
NETSNMP=@PBX_NETSNMP@
|
||||||
NEWT=@PBX_NEWT@
|
NEWT=@PBX_NEWT@
|
||||||
NEON=@PBX_NEON@
|
NEON=@PBX_NEON@
|
||||||
|
NEON29=@PBX_NEON29@
|
||||||
OGG=@PBX_OGG@
|
OGG=@PBX_OGG@
|
||||||
OPENH323=@PBX_OPENH323@
|
OPENH323=@PBX_OPENH323@
|
||||||
OSPTK=@PBX_OSPTK@
|
OSPTK=@PBX_OSPTK@
|
||||||
|
@@ -331,6 +331,7 @@ AST_EXT_LIB_SETUP([MYSQLCLIENT], [MySQL client], [mysqlclient])
|
|||||||
AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
|
AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
|
||||||
AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
|
AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
|
||||||
AST_EXT_LIB_SETUP([NEON], [neon], [neon])
|
AST_EXT_LIB_SETUP([NEON], [neon], [neon])
|
||||||
|
AST_EXT_LIB_SETUP([NEON29], [neon29], [neon29])
|
||||||
AST_EXT_LIB_SETUP([NETSNMP], [Net-SNMP], [netsnmp])
|
AST_EXT_LIB_SETUP([NETSNMP], [Net-SNMP], [netsnmp])
|
||||||
AST_EXT_LIB_SETUP([NEWT], [newt], [newt])
|
AST_EXT_LIB_SETUP([NEWT], [newt], [newt])
|
||||||
AST_EXT_LIB_SETUP([OGG], [OGG], [ogg])
|
AST_EXT_LIB_SETUP([OGG], [OGG], [ogg])
|
||||||
@@ -1511,6 +1512,12 @@ AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
|
|||||||
|
|
||||||
AST_EXT_TOOL_CHECK([NEON], [neon-config])
|
AST_EXT_TOOL_CHECK([NEON], [neon-config])
|
||||||
|
|
||||||
|
AST_EXT_TOOL_CHECK([NEON29], [neon-config], , [--libs],
|
||||||
|
[#include <ne_auth.h>],
|
||||||
|
[#ifndef NE_AUTH_NTLM
|
||||||
|
#error Need libneon >= 0.29.0
|
||||||
|
#endif])
|
||||||
|
|
||||||
AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--agent-libs],
|
AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--agent-libs],
|
||||||
[#include <net-snmp/net-snmp-config.h>
|
[#include <net-snmp/net-snmp-config.h>
|
||||||
#include <net-snmp/net-snmp-includes.h>
|
#include <net-snmp/net-snmp-includes.h>
|
||||||
|
@@ -454,6 +454,9 @@
|
|||||||
/* Define if your system has the NEON libraries. */
|
/* Define if your system has the NEON libraries. */
|
||||||
#undef HAVE_NEON
|
#undef HAVE_NEON
|
||||||
|
|
||||||
|
/* Define if your system has the NEON29 libraries. */
|
||||||
|
#undef HAVE_NEON29
|
||||||
|
|
||||||
/* Define to 1 if you have the <netdb.h> header file. */
|
/* Define to 1 if you have the <netdb.h> header file. */
|
||||||
#undef HAVE_NETDB_H
|
#undef HAVE_NETDB_H
|
||||||
|
|
||||||
@@ -767,7 +770,7 @@
|
|||||||
/* Define to 1 if you have the `strtoq' function. */
|
/* Define to 1 if you have the `strtoq' function. */
|
||||||
#undef HAVE_STRTOQ
|
#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
|
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
|
||||||
|
|
||||||
/* Define to 1 if you have the mISDN Supplemental Services library. */
|
/* Define to 1 if you have the mISDN Supplemental Services library. */
|
||||||
@@ -1035,12 +1038,12 @@
|
|||||||
/* Define to the one symbol short name of this package. */
|
/* Define to the one symbol short name of this package. */
|
||||||
#undef PACKAGE_TARNAME
|
#undef PACKAGE_TARNAME
|
||||||
|
|
||||||
|
/* Define to the home page for this package. */
|
||||||
|
#undef PACKAGE_URL
|
||||||
|
|
||||||
/* Define to the version of this package. */
|
/* Define to the version of this package. */
|
||||||
#undef PACKAGE_VERSION
|
#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
|
/* Define to necessary symbol if this constant uses a non-standard name on
|
||||||
your system. */
|
your system. */
|
||||||
#undef PTHREAD_CREATE_JOINABLE
|
#undef PTHREAD_CREATE_JOINABLE
|
||||||
@@ -1060,11 +1063,6 @@
|
|||||||
/* Define to the type of arg 5 for `select'. */
|
/* Define to the type of arg 5 for `select'. */
|
||||||
#undef SELECT_TYPE_ARG5
|
#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. */
|
/* The size of `char *', as computed by sizeof. */
|
||||||
#undef SIZEOF_CHAR_P
|
#undef SIZEOF_CHAR_P
|
||||||
|
|
||||||
@@ -1094,20 +1092,30 @@
|
|||||||
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
||||||
#undef TM_IN_SYS_TIME
|
#undef TM_IN_SYS_TIME
|
||||||
|
|
||||||
/* Define to 1 if on AIX 3.
|
/* Enable extensions on AIX 3, Interix. */
|
||||||
System headers sometimes define this.
|
|
||||||
We just want to avoid a redefinition error message. */
|
|
||||||
#ifndef _ALL_SOURCE
|
#ifndef _ALL_SOURCE
|
||||||
# undef _ALL_SOURCE
|
# undef _ALL_SOURCE
|
||||||
#endif
|
#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. */
|
/* Enable GNU extensions on systems that have them. */
|
||||||
#ifndef _GNU_SOURCE
|
#ifndef _GNU_SOURCE
|
||||||
# undef _GNU_SOURCE
|
# undef _GNU_SOURCE
|
||||||
#endif
|
#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). */
|
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
|
||||||
#undef _LARGEFILE_SOURCE
|
#undef _LARGEFILE_SOURCE
|
||||||
@@ -1125,20 +1133,6 @@
|
|||||||
/* Define to 1 if you need to in order for `stat' and other things to work. */
|
/* Define to 1 if you need to in order for `stat' and other things to work. */
|
||||||
#undef _POSIX_SOURCE
|
#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. */
|
/* Define to empty if `const' does not conform to ANSI C. */
|
||||||
#undef const
|
#undef const
|
||||||
|
|
||||||
|
@@ -21,7 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/*** MODULEINFO
|
/*** MODULEINFO
|
||||||
<depend>neon</depend>
|
<depend>neon29</depend>
|
||||||
***/
|
***/
|
||||||
#include "asterisk.h"
|
#include "asterisk.h"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user