diff options
| author | David M. Lee <dlee@digium.com> | 2013-03-22 14:06:46 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-03-22 14:06:46 +0000 |
| commit | cf9324b25eb8a7dc5cef77f54e12758dfbcd6645 (patch) | |
| tree | 67492a4753d03498d3b842939d1c4c9256efa013 /configure.ac | |
| parent | 401f7c188038a327ed40a7bff30a28f03b69f8a1 (diff) | |
Move more channel events to Stasis; move res_json.c to main/json.c.
This patch started out simply as fixing the bouncing tests introduced
in r382685, but required some other changes to give it a decent
implementation.
To fix the bouncing tests, the UserEvent and Newexten AMI events
needed to be refactored to dispatch via Stasis. Dispatching directly
to AMI resulted in those events sometimes getting ahead of the
associated Newchannel events, which would understandably confuse anyone.
I found that instead of creating a zillion different message types and
structures associated with them, it would be preferable to define a
message type that has a channel snapshot and a blob of structured data
with a small bit of additional information. The JSON object model
provides a very nice way of representing structured data, so I went
with that.
* Move JSON support from res_json.c to main/json.c
* Made libjansson-dev a required dependency
* Added an ast_channel_blob message type, which has a channel
snapshot and JSON blob of data.
* Changed UserEvent and Newexten events so that they are dispatched
via ast_channel_blob messages on the channel's topic.
* Got rid of the ast_channel_varset message; used ast_channel_blob
instead.
* Extracted the manager functions converting Stasis channel events to
AMI events into manager_channel.c.
(issue ASTERISK-21096)
Review: https://reviewboard.asterisk.org/r/2381/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383579 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 4df9dc3e6..9f37cb760 100644 --- a/configure.ac +++ b/configure.ac @@ -491,12 +491,13 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/event.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h]) -# Any one of these 5 packages support a mandatory requirement, so we want to check on them as early as possible. +# Any one of these packages support a mandatory requirement, so we want to check on them as early as possible. AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], []) AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], []) AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h]) AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h]) AST_EXT_LIB_CHECK([UUID], [uuid], [uuid_generate_random], [uuid/uuid.h], [-luuid]) +AST_EXT_LIB_CHECK([JANSSON], [jansson], [json_dumps], [jansson.h]) EDITLINE_LIB="" if test "x$TERMCAP_LIB" != "x" ; then @@ -516,6 +517,10 @@ if test "x$UUID_LIB" == "x"; then AC_MSG_ERROR([*** uuid support not found (this typically means the uuid development package is missing)]) fi +if test "x$JANSSON_LIB" == "x"; then + AC_MSG_ERROR([*** JSON support not found (this typically means the libjansson development package is missing)]) +fi + # Another mandatory item (unless it's explicitly disabled) AC_ARG_ENABLE([xmldoc], [AS_HELP_STRING([--disable-xmldoc], @@ -1869,8 +1874,6 @@ AST_EXT_LIB_CHECK([INOTIFY], [c], [inotify_init], [sys/inotify.h]) AST_EXT_LIB_CHECK([JACK], [jack], [jack_activate], [jack/jack.h]) -AST_EXT_LIB_CHECK([JANSSON], [jansson], [json_dumps], [jansson.h]) - # BSD (and OS X) equivalent of inotify AST_EXT_LIB_CHECK([KQUEUE], [c], [kqueue], [sys/event.h]) |