[asterisk-commits] dlee: branch dlee/json_main r382811 - in /team/dlee/json_main: ./ include/ast...

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Mar 11 14:28:41 2013
New Revision: 382811

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382811
Log:
Make libjansson a required dependency

Modified:
    team/dlee/json_main/configure
    team/dlee/json_main/configure.ac
    team/dlee/json_main/include/asterisk/autoconfig.h.in

Modified: team/dlee/json_main/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/dlee/json_main/configure.ac?view=diff&rev=382811&r1=382810&r2=382811
==============================================================================
--- team/dlee/json_main/configure.ac (original)
+++ team/dlee/json_main/configure.ac Mon Mar 11 14:28:41 2013
@@ -490,12 +490,13 @@
 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
@@ -513,6 +514,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 not found (this typically means the libjansson development package is missing)])
 fi
 
 # Another mandatory item (unless it's explicitly disabled)
@@ -1868,8 +1873,6 @@
 
 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])
 

Modified: team/dlee/json_main/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/dlee/json_main/include/asterisk/autoconfig.h.in?view=diff&rev=382811&r1=382810&r2=382811
==============================================================================
--- team/dlee/json_main/include/asterisk/autoconfig.h.in (original)
+++ team/dlee/json_main/include/asterisk/autoconfig.h.in Mon Mar 11 14:28:41 2013
@@ -1226,6 +1226,11 @@
 /* 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