From 991e128df5643d47953879b042a940400b983681 Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Mon, 5 Mar 2018 23:16:43 -0500 Subject: [PATCH] Bump version to 0.13.1, and re-generate autoconf and automake files. --- CMakeLists.txt | 2 +- Doxyfile | 2 +- Makefile.in | 4 +- config.h.win32 | 6 +- configure | 139 +++++++++++++++++++++++++++++++++++++++++++---- configure.ac | 2 +- json_c_version.h | 4 +- 7 files changed, 139 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b38781..5e828ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.7) cmake_policy(SET CMP0048 NEW) -project(json-c VERSION 0.13) +project(json-c VERSION 0.13.1) include(CheckSymbolExists) diff --git a/Doxyfile b/Doxyfile index aa7face..a7e6ac2 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = json-c # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.13 +PROJECT_NUMBER = 0.13.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/Makefile.in b/Makefile.in index ce9e799..9cbc906 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,6 +14,8 @@ @SET_MAKE@ +#ACLOCAL_AMFLAGS = -I autoconf-archive/m4 + VPATH = @srcdir@ @@ -418,7 +420,7 @@ noinst_HEADERS = \ random_seed.h \ strerror_override.h -libjson_c_la_LDFLAGS = -version-info 3:1:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@ +libjson_c_la_LDFLAGS = -version-info 4:0:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@ libjson_c_la_SOURCES = \ arraylist.c \ debug.c \ diff --git a/config.h.win32 b/config.h.win32 index fc4c4b0..798343a 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -175,7 +175,7 @@ #define PACKAGE_NAME "JSON C Library" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "JSON C Library 0.13" +#define PACKAGE_STRING "JSON C Library 0.13.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "json-c" @@ -184,13 +184,13 @@ #define PACKAGE_URL "https://github.com/json-c/json-c" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.13" +#define PACKAGE_VERSION "0.13.1" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.13" +#define VERSION "0.13.1" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/configure b/configure index 88b9e4b..263d37d 100755 --- a/configure +++ b/configure @@ -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.13. +# Generated by GNU Autoconf 2.69 for json-c 0.13.1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='json-c' PACKAGE_TARNAME='json-c' -PACKAGE_VERSION='0.13' -PACKAGE_STRING='json-c 0.13' +PACKAGE_VERSION='0.13.1' +PACKAGE_STRING='json-c 0.13.1' PACKAGE_BUGREPORT='json-c@googlegroups.com' PACKAGE_URL='' @@ -1313,7 +1313,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.13 to adapt to many kinds of systems. +\`configure' configures json-c 0.13.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,7 +1383,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of json-c 0.13:";; + short | recursive ) echo "Configuration of json-c 0.13.1:";; esac cat <<\_ACEOF @@ -1492,7 +1492,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -json-c configure 0.13 +json-c configure 0.13.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1961,7 +1961,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.13, which was +It was created by json-c $as_me 0.13.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2825,7 +2825,7 @@ fi # Define the identity of the package. PACKAGE='json-c' - VERSION='0.13' + VERSION='0.13.1' cat >>confdefs.h <<_ACEOF @@ -12508,7 +12508,7 @@ done -for flag in -D_GNU_SOURCE -D_REENTRANT; do +for flag in -D_GNU_SOURCE; do as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 $as_echo_n "checking whether C compiler accepts $flag... " >&6; } @@ -12580,6 +12580,123 @@ fi done +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatibility with _REENTRANT and toolchain headers" >&5 +$as_echo_n "checking for compatibility with _REENTRANT and toolchain headers... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +/* uClibc toolchains without threading barf when _REENTRANT is defined */ +#define _REENTRANT 1 +#include +int main () +{ + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + + + +for flag in -D_REENTRANT; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${CFLAGS+:} false; then : + + case " $CFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5 + (: CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append CFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + CFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5 + (: CFLAGS="$CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + +done + + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 $as_echo_n "checking size of int... " >&6; } if ${ac_cv_sizeof_int+:} false; then : @@ -13314,7 +13431,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.13, which was +This file was extended by json-c $as_me 0.13.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13380,7 +13497,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.13 +json-c config.status 0.13.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ab0c3d6..46c37dc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.64) # Process this file with autoconf to produce a configure script. -AC_INIT([json-c], 0.13, [json-c@googlegroups.com]) +AC_INIT([json-c], 0.13.1, [json-c@googlegroups.com]) AM_INIT_AUTOMAKE diff --git a/json_c_version.h b/json_c_version.h index 34db2a2..98838be 100644 --- a/json_c_version.h +++ b/json_c_version.h @@ -14,11 +14,11 @@ #define JSON_C_MAJOR_VERSION 0 #define JSON_C_MINOR_VERSION 13 -#define JSON_C_MICRO_VERSION 00 +#define JSON_C_MICRO_VERSION 01 #define JSON_C_VERSION_NUM ((JSON_C_MAJOR_VERSION << 16) | \ (JSON_C_MINOR_VERSION << 8) | \ JSON_C_MICRO_VERSION) -#define JSON_C_VERSION "0.13" +#define JSON_C_VERSION "0.13.1" /** * @see JSON_C_VERSION