@@ -1,4 +1,8 @@ | |||
0.12.1 | |||
* Minimal changes to address compile issues. | |||
0.12 | |||
* Address security issues: | |||
@@ -23,7 +23,7 @@ PROJECT_NAME = json-c | |||
# This could be handy for archiving the generated documentation or | |||
# if some version control system is used. | |||
PROJECT_NUMBER = 0.12 | |||
PROJECT_NUMBER = 0.12.1 | |||
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) | |||
# base path where the generated documentation will be put. | |||
@@ -31,7 +31,7 @@ libjson_cinclude_HEADERS = \ | |||
#libjsonx_include_HEADERS = \ | |||
# json_config.h | |||
libjson_c_la_LDFLAGS = -version-info 2:1:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@ | |||
libjson_c_la_LDFLAGS = -version-info 2:2:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@ | |||
libjson_c_la_SOURCES = \ | |||
arraylist.c \ | |||
@@ -1,7 +1,7 @@ | |||
# Makefile.in generated by automake 1.14 from Makefile.am. | |||
# Makefile.in generated by automake 1.15 from Makefile.am. | |||
# @configure_input@ | |||
# Copyright (C) 1994-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1994-2014 Free Software Foundation, Inc. | |||
# This Makefile.in is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -17,7 +17,17 @@ | |||
VPATH = @srcdir@ | |||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |||
am__is_gnu_make = { \ | |||
if test -z '$(MAKELEVEL)'; then \ | |||
false; \ | |||
elif test -n '$(MAKE_HOST)'; then \ | |||
true; \ | |||
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ | |||
true; \ | |||
else \ | |||
false; \ | |||
fi; \ | |||
} | |||
am__make_running_with_option = \ | |||
case $${target_option-} in \ | |||
?) ;; \ | |||
@@ -80,18 +90,14 @@ PRE_UNINSTALL = : | |||
POST_UNINSTALL = : | |||
build_triplet = @build@ | |||
host_triplet = @host@ | |||
DIST_COMMON = $(srcdir)/Makefile.am.inc INSTALL NEWS README AUTHORS \ | |||
ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | |||
$(top_srcdir)/configure $(am__configure_deps) \ | |||
$(srcdir)/config.h.in $(srcdir)/json_config.h.in \ | |||
$(srcdir)/json-c.pc.in $(srcdir)/json-c-uninstalled.pc.in \ | |||
depcomp $(libjson_cinclude_HEADERS) COPYING compile \ | |||
config.guess config.sub install-sh missing ltmain.sh | |||
subdir = . | |||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac | |||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | |||
$(ACLOCAL_M4) | |||
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ | |||
$(am__configure_deps) $(libjson_cinclude_HEADERS) \ | |||
$(am__DIST_COMMON) | |||
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | |||
configure.lineno config.status.lineno | |||
mkinstalldirs = $(install_sh) -d | |||
@@ -221,6 +227,11 @@ ETAGS = etags | |||
CTAGS = ctags | |||
CSCOPE = cscope | |||
DIST_SUBDIRS = $(SUBDIRS) | |||
am__DIST_COMMON = $(srcdir)/Makefile.am.inc $(srcdir)/Makefile.in \ | |||
$(srcdir)/config.h.in $(srcdir)/json-c-uninstalled.pc.in \ | |||
$(srcdir)/json-c.pc.in $(srcdir)/json_config.h.in AUTHORS \ | |||
COPYING ChangeLog INSTALL NEWS README compile config.guess \ | |||
config.sub depcomp install-sh ltmain.sh missing | |||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |||
distdir = $(PACKAGE)-$(VERSION) | |||
top_distdir = $(distdir) | |||
@@ -407,7 +418,7 @@ libjson_cinclude_HEADERS = \ | |||
# | |||
#libjsonx_include_HEADERS = \ | |||
# json_config.h | |||
libjson_c_la_LDFLAGS = -version-info 2:1:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@ | |||
libjson_c_la_LDFLAGS = -version-info 2:2:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@ | |||
libjson_c_la_SOURCES = \ | |||
arraylist.c \ | |||
debug.c \ | |||
@@ -441,7 +452,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.am.inc $(am__co | |||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ | |||
$(am__cd) $(top_srcdir) && \ | |||
$(AUTOMAKE) --gnu Makefile | |||
.PRECIOUS: Makefile | |||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |||
@case '$?' in \ | |||
*config.status*) \ | |||
@@ -451,7 +461,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | |||
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | |||
esac; | |||
$(srcdir)/Makefile.am.inc: | |||
$(srcdir)/Makefile.am.inc $(am__empty): | |||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |||
$(SHELL) ./config.status --recheck | |||
@@ -803,15 +813,15 @@ dist-xz: distdir | |||
$(am__post_remove_distdir) | |||
dist-tarZ: distdir | |||
@echo WARNING: "Support for shar distribution archives is" \ | |||
"deprecated." >&2 | |||
@echo WARNING: "Support for distribution archives compressed with" \ | |||
"legacy program 'compress' is deprecated." >&2 | |||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | |||
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | |||
$(am__post_remove_distdir) | |||
dist-shar: distdir | |||
@echo WARNING: "Support for distribution archives compressed with" \ | |||
"legacy program 'compress' is deprecated." >&2 | |||
@echo WARNING: "Support for shar distribution archives is" \ | |||
"deprecated." >&2 | |||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | |||
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz | |||
$(am__post_remove_distdir) | |||
@@ -847,16 +857,17 @@ distcheck: dist | |||
esac | |||
chmod -R a-w $(distdir) | |||
chmod u+w $(distdir) | |||
mkdir $(distdir)/_build $(distdir)/_inst | |||
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst | |||
chmod a-w $(distdir) | |||
test -d $(distdir)/_build || exit 0; \ | |||
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ | |||
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ | |||
&& am__cwd=`pwd` \ | |||
&& $(am__cd) $(distdir)/_build \ | |||
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \ | |||
&& $(am__cd) $(distdir)/_build/sub \ | |||
&& ../../configure \ | |||
$(AM_DISTCHECK_CONFIGURE_FLAGS) \ | |||
$(DISTCHECK_CONFIGURE_FLAGS) \ | |||
--srcdir=../.. --prefix="$$dc_install_base" \ | |||
&& $(MAKE) $(AM_MAKEFLAGS) \ | |||
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ | |||
&& $(MAKE) $(AM_MAKEFLAGS) check \ | |||
@@ -1049,6 +1060,8 @@ uninstall-am: uninstall-libLTLIBRARIES \ | |||
uninstall-libjson_cincludeHEADERS uninstall-local \ | |||
uninstall-pkgconfigDATA | |||
.PRECIOUS: Makefile | |||
distclean-local: | |||
-rm -rf $(testsubdir) | |||
@@ -1,6 +1,6 @@ | |||
# generated automatically by aclocal 1.14 -*- Autoconf -*- | |||
# generated automatically by aclocal 1.15 -*- Autoconf -*- | |||
# Copyright (C) 1996-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1996-2014 Free Software Foundation, Inc. | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -8607,7 +8607,7 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) | |||
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) | |||
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) | |||
# Copyright (C) 2002-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2002-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -8619,10 +8619,10 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) | |||
# generated from the m4 files accompanying Automake X.Y. | |||
# (This private macro should not be called outside this file.) | |||
AC_DEFUN([AM_AUTOMAKE_VERSION], | |||
[am__api_version='1.14' | |||
[am__api_version='1.15' | |||
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | |||
dnl require some minimum version. Point them to the right macro. | |||
m4_if([$1], [1.14], [], | |||
m4_if([$1], [1.15], [], | |||
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | |||
]) | |||
@@ -8638,14 +8638,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) | |||
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | |||
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | |||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | |||
[AM_AUTOMAKE_VERSION([1.14])dnl | |||
[AM_AUTOMAKE_VERSION([1.15])dnl | |||
m4_ifndef([AC_AUTOCONF_VERSION], | |||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | |||
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | |||
# AM_AUX_DIR_EXPAND -*- Autoconf -*- | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -8690,15 +8690,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | |||
# configured tree to be moved without reconfiguration. | |||
AC_DEFUN([AM_AUX_DIR_EXPAND], | |||
[dnl Rely on autoconf to set up CDPATH properly. | |||
AC_PREREQ([2.50])dnl | |||
# expand $ac_aux_dir to an absolute path | |||
am_aux_dir=`cd $ac_aux_dir && pwd` | |||
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl | |||
# Expand $ac_aux_dir to an absolute path. | |||
am_aux_dir=`cd "$ac_aux_dir" && pwd` | |||
]) | |||
# AM_CONDITIONAL -*- Autoconf -*- | |||
# Copyright (C) 1997-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1997-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -8729,7 +8728,7 @@ AC_CONFIG_COMMANDS_PRE( | |||
Usually this means the macro was only invoked conditionally.]]) | |||
fi])]) | |||
# Copyright (C) 1999-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1999-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -8920,7 +8919,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl | |||
# Generate code to set up dependency tracking. -*- Autoconf -*- | |||
# Copyright (C) 1999-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1999-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -8996,7 +8995,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
# Do all the work for Automake. -*- Autoconf -*- | |||
# Copyright (C) 1996-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1996-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9086,8 +9085,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl | |||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | |||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | |||
AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | |||
# We need awk for the "check" target. The system "awk" is bad on | |||
# some platforms. | |||
# We need awk for the "check" target (and possibly the TAP driver). The | |||
# system "awk" is bad on some platforms. | |||
AC_REQUIRE([AC_PROG_AWK])dnl | |||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl | |||
AC_REQUIRE([AM_SET_LEADING_DOT])dnl | |||
@@ -9160,7 +9159,11 @@ to "yes", and re-run configure. | |||
END | |||
AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) | |||
fi | |||
fi]) | |||
fi | |||
dnl The trailing newline in this macro's definition is deliberate, for | |||
dnl backward compatibility and to allow trailing 'dnl'-style comments | |||
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. | |||
]) | |||
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | |||
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | |||
@@ -9189,7 +9192,7 @@ for _am_header in $config_headers :; do | |||
done | |||
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9200,7 +9203,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co | |||
# Define $install_sh. | |||
AC_DEFUN([AM_PROG_INSTALL_SH], | |||
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | |||
if test x"${install_sh}" != xset; then | |||
if test x"${install_sh+set}" != xset; then | |||
case $am_aux_dir in | |||
*\ * | *\ *) | |||
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | |||
@@ -9210,7 +9213,7 @@ if test x"${install_sh}" != xset; then | |||
fi | |||
AC_SUBST([install_sh])]) | |||
# Copyright (C) 2003-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2003-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9231,7 +9234,7 @@ AC_SUBST([am__leading_dot])]) | |||
# Check to see how 'make' treats includes. -*- Autoconf -*- | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9281,7 +9284,7 @@ rm -f confinc confmf | |||
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | |||
# Copyright (C) 1997-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1997-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9320,7 +9323,7 @@ fi | |||
# Helper functions for option handling. -*- Autoconf -*- | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9349,7 +9352,7 @@ AC_DEFUN([_AM_SET_OPTIONS], | |||
AC_DEFUN([_AM_IF_OPTION], | |||
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | |||
# Copyright (C) 1999-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1999-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9396,7 +9399,7 @@ AC_LANG_POP([C])]) | |||
# For backward compatibility. | |||
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9415,7 +9418,7 @@ AC_DEFUN([AM_RUN_LOG], | |||
# Check to make sure that the build environment is sane. -*- Autoconf -*- | |||
# Copyright (C) 1996-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1996-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9496,7 +9499,7 @@ AC_CONFIG_COMMANDS_PRE( | |||
rm -f conftest.file | |||
]) | |||
# Copyright (C) 2009-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2009-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9556,7 +9559,7 @@ AC_SUBST([AM_BACKSLASH])dnl | |||
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | |||
]) | |||
# Copyright (C) 2001-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2001-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9584,7 +9587,7 @@ fi | |||
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | |||
AC_SUBST([INSTALL_STRIP_PROGRAM])]) | |||
# Copyright (C) 2006-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2006-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -9603,7 +9606,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | |||
# Check how to create a tarball. -*- Autoconf -*- | |||
# Copyright (C) 2004-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 2004-2014 Free Software Foundation, Inc. | |||
# | |||
# This file is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -1,6 +1,6 @@ | |||
#! /bin/sh | |||
# Guess values for system-dependent variables and create Makefiles. | |||
# Generated by GNU Autoconf 2.69 for json-c 0.12. | |||
# Generated by GNU Autoconf 2.69 for json-c 0.12.1. | |||
# | |||
# Report bugs to <json-c@googlegroups.com>. | |||
# | |||
@@ -590,8 +590,8 @@ MAKEFLAGS= | |||
# Identity of this package. | |||
PACKAGE_NAME='json-c' | |||
PACKAGE_TARNAME='json-c' | |||
PACKAGE_VERSION='0.12' | |||
PACKAGE_STRING='json-c 0.12' | |||
PACKAGE_VERSION='0.12.1' | |||
PACKAGE_STRING='json-c 0.12.1' | |||
PACKAGE_BUGREPORT='json-c@googlegroups.com' | |||
PACKAGE_URL='' | |||
@@ -1312,7 +1312,7 @@ if test "$ac_init_help" = "long"; then | |||
# Omit some internal or obsolete options to make the list less imposing. | |||
# This message is too long to be a string in the A/UX 3.1 sh. | |||
cat <<_ACEOF | |||
\`configure' configures json-c 0.12 to adapt to many kinds of systems. | |||
\`configure' configures json-c 0.12.1 to adapt to many kinds of systems. | |||
Usage: $0 [OPTION]... [VAR=VALUE]... | |||
@@ -1382,7 +1382,7 @@ fi | |||
if test -n "$ac_init_help"; then | |||
case $ac_init_help in | |||
short | recursive ) echo "Configuration of json-c 0.12:";; | |||
short | recursive ) echo "Configuration of json-c 0.12.1:";; | |||
esac | |||
cat <<\_ACEOF | |||
@@ -1490,7 +1490,7 @@ fi | |||
test -n "$ac_init_help" && exit $ac_status | |||
if $ac_init_version; then | |||
cat <<\_ACEOF | |||
json-c configure 0.12 | |||
json-c configure 0.12.1 | |||
generated by GNU Autoconf 2.69 | |||
Copyright (C) 2012 Free Software Foundation, Inc. | |||
@@ -1959,7 +1959,7 @@ cat >config.log <<_ACEOF | |||
This file contains any messages produced by compilers while | |||
running configure, to aid debugging if configure makes a mistake. | |||
It was created by json-c $as_me 0.12, which was | |||
It was created by json-c $as_me 0.12.1, which was | |||
generated by GNU Autoconf 2.69. Invocation command line was | |||
$ $0 $@ | |||
@@ -2308,7 +2308,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
am__api_version='1.14' | |||
am__api_version='1.15' | |||
ac_aux_dir= | |||
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | |||
@@ -2509,8 +2509,8 @@ test "$program_suffix" != NONE && | |||
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' | |||
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` | |||
# expand $ac_aux_dir to an absolute path | |||
am_aux_dir=`cd $ac_aux_dir && pwd` | |||
# Expand $ac_aux_dir to an absolute path. | |||
am_aux_dir=`cd "$ac_aux_dir" && pwd` | |||
if test x"${MISSING+set}" != xset; then | |||
case $am_aux_dir in | |||
@@ -2529,7 +2529,7 @@ else | |||
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} | |||
fi | |||
if test x"${install_sh}" != xset; then | |||
if test x"${install_sh+set}" != xset; then | |||
case $am_aux_dir in | |||
*\ * | *\ *) | |||
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | |||
@@ -2823,7 +2823,7 @@ fi | |||
# Define the identity of the package. | |||
PACKAGE='json-c' | |||
VERSION='0.12' | |||
VERSION='0.12.1' | |||
cat >>confdefs.h <<_ACEOF | |||
@@ -2857,8 +2857,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | |||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | |||
mkdir_p='$(MKDIR_P)' | |||
# We need awk for the "check" target. The system "awk" is bad on | |||
# some platforms. | |||
# We need awk for the "check" target (and possibly the TAP driver). The | |||
# system "awk" is bad on some platforms. | |||
# Always define AMTAR for backward compatibility. Yes, it's still used | |||
# in the wild :-( We should find a proper way to deprecate it ... | |||
AMTAR='$${TAR-tar}' | |||
@@ -2916,6 +2916,7 @@ END | |||
fi | |||
fi | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | |||
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } | |||
set x ${MAKE-make} | |||
@@ -12638,7 +12639,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
# report actual input values of CONFIG_FILES etc. instead of their | |||
# values after options handling. | |||
ac_log=" | |||
This file was extended by json-c $as_me 0.12, which was | |||
This file was extended by json-c $as_me 0.12.1, which was | |||
generated by GNU Autoconf 2.69. Invocation command line was | |||
CONFIG_FILES = $CONFIG_FILES | |||
@@ -12704,7 +12705,7 @@ _ACEOF | |||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | |||
ac_cs_version="\\ | |||
json-c config.status 0.12 | |||
json-c config.status 0.12.1 | |||
configured by $0, generated by GNU Autoconf 2.69, | |||
with options \\"\$ac_cs_config\\" | |||
@@ -1,7 +1,7 @@ | |||
AC_PREREQ(2.52) | |||
# Process this file with autoconf to produce a configure script. | |||
AC_INIT([json-c], 0.12, [json-c@googlegroups.com]) | |||
AC_INIT([json-c], 0.12.1, [json-c@googlegroups.com]) | |||
AM_INIT_AUTOMAKE | |||
@@ -10,11 +10,11 @@ | |||
#define JSON_C_MAJOR_VERSION 0 | |||
#define JSON_C_MINOR_VERSION 12 | |||
#define JSON_C_MICRO_VERSION 0 | |||
#define JSON_C_MICRO_VERSION 1 | |||
#define JSON_C_VERSION_NUM ((JSON_C_MAJOR_VERSION << 16) | \ | |||
(JSON_C_MINOR_VERSION << 8) | \ | |||
JSON_C_MICRO_VERSION) | |||
#define JSON_C_VERSION "0.12" | |||
#define JSON_C_VERSION "0.12.1" | |||
const char *json_c_version(void); /* Returns JSON_C_VERSION */ | |||
int json_c_version_num(void); /* Returns JSON_C_VERSION_NUM */ | |||
@@ -1,7 +1,7 @@ | |||
# Makefile.in generated by automake 1.14 from Makefile.am. | |||
# Makefile.in generated by automake 1.15 from Makefile.am. | |||
# @configure_input@ | |||
# Copyright (C) 1994-2013 Free Software Foundation, Inc. | |||
# Copyright (C) 1994-2014 Free Software Foundation, Inc. | |||
# This Makefile.in is free software; the Free Software Foundation | |||
# gives unlimited permission to copy and/or distribute it, | |||
@@ -14,7 +14,17 @@ | |||
@SET_MAKE@ | |||
VPATH = @srcdir@ | |||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |||
am__is_gnu_make = { \ | |||
if test -z '$(MAKELEVEL)'; then \ | |||
false; \ | |||
elif test -n '$(MAKE_HOST)'; then \ | |||
true; \ | |||
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ | |||
true; \ | |||
else \ | |||
false; \ | |||
fi; \ | |||
} | |||
am__make_running_with_option = \ | |||
case $${target_option-} in \ | |||
?) ;; \ | |||
@@ -77,9 +87,6 @@ PRE_UNINSTALL = : | |||
POST_UNINSTALL = : | |||
build_triplet = @build@ | |||
host_triplet = @host@ | |||
DIST_COMMON = $(srcdir)/../Makefile.am.inc $(srcdir)/Makefile.in \ | |||
$(srcdir)/Makefile.am $(top_srcdir)/depcomp \ | |||
$(top_srcdir)/test-driver | |||
check_PROGRAMS = $(am__EXEEXT_1) test1Formatted$(EXEEXT) \ | |||
test2Formatted$(EXEEXT) | |||
subdir = tests | |||
@@ -87,6 +94,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac | |||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | |||
$(ACLOCAL_M4) | |||
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) | |||
mkinstalldirs = $(install_sh) -d | |||
CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/json_config.h | |||
CONFIG_CLEAN_FILES = | |||
@@ -428,6 +436,8 @@ am__set_b = \ | |||
*) \ | |||
b='$*';; \ | |||
esac | |||
am__DIST_COMMON = $(srcdir)/../Makefile.am.inc $(srcdir)/Makefile.in \ | |||
$(top_srcdir)/depcomp $(top_srcdir)/test-driver | |||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |||
ACLOCAL = @ACLOCAL@ | |||
AMTAR = @AMTAR@ | |||
@@ -574,7 +584,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../Makefile.am.inc $(am_ | |||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ | |||
$(am__cd) $(top_srcdir) && \ | |||
$(AUTOMAKE) --gnu tests/Makefile | |||
.PRECIOUS: Makefile | |||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |||
@case '$?' in \ | |||
*config.status*) \ | |||
@@ -583,7 +592,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | |||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | |||
esac; | |||
$(srcdir)/../Makefile.am.inc: | |||
$(srcdir)/../Makefile.am.inc $(am__empty): | |||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |||
@@ -847,7 +856,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) | |||
if test -n "$$am__remaking_logs"; then \ | |||
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ | |||
"recursion detected" >&2; \ | |||
else \ | |||
elif test -n "$$redo_logs"; then \ | |||
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ | |||
fi; \ | |||
if $(am__make_dryrun); then :; else \ | |||
@@ -1129,6 +1138,8 @@ uninstall-am: | |||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | |||
recheck tags tags-am uninstall uninstall-am | |||
.PRECIOUS: Makefile | |||
distclean-local: | |||
-rm -rf $(testsubdir) | |||