Merge 8aaf0b1f40 into a789601e6d

Makefile.am

@@ -18,10 +18,12 @@ libjsoninclude_HEADERS = \
 	json_inttypes.h \
 	json_object.h \
 	json_object_private.h \
+	json_object_iterator.h \
 	json_tokener.h \
 	json_util.h \
 	linkhash.h \
 	printbuf.h
+	
 
 #libjsonx_includedir = $(libdir)/json-c-@VERSION@
 #

config.h.in

@@ -29,6 +29,9 @@
    and to 0 otherwise. */
 #undef HAVE_REALLOC
 
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
 /* Define to 1 if you have the <stdarg.h> header file. */
 #undef HAVE_STDARG_H
 
@@ -38,6 +41,9 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 

configure.in

@@ -27,7 +27,7 @@ AC_FUNC_VPRINTF
 AC_FUNC_MEMCMP
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS(strndup strerror vsnprintf vasprintf open vsyslog strncasecmp)
+AC_CHECK_FUNCS(strndup strdup strerror snprintf vsnprintf vasprintf open vsyslog strncasecmp)
 
 AM_PROG_LIBTOOL