Browse Source

jansson: use config.h new name (like v2.7)

to prevent config.h conflicts
master
Tanguy Pruvot 10 years ago
parent
commit
858c3d9370
  1. 1
      compat/jansson/.gitignore
  2. 2
      compat/jansson/Makefile.am
  3. 2
      compat/jansson/configure.ac
  4. 39
      compat/jansson/jansson_config.h.in
  5. 4
      compat/jansson/jansson_private_config.h
  6. 139
      compat/jansson/jansson_private_config.h.in
  7. 4
      compat/jansson/strconv.c
  8. 2
      compat/jansson/utf.h

1
compat/jansson/.gitignore vendored

@ -1,4 +1,3 @@
*.h.in
*.h.in~ *.h.in~
libtool libtool
libjansson.a libjansson.a

2
compat/jansson/Makefile.am

@ -2,7 +2,7 @@
noinst_LIBRARIES = libjansson.a noinst_LIBRARIES = libjansson.a
libjansson_a_SOURCES = \ libjansson_a_SOURCES = \
config.h \ jansson_private_config.h \
dump.c \ dump.c \
error.c \ error.c \
hashtable.c hashtable.h \ hashtable.c hashtable.h \

2
compat/jansson/configure.ac

@ -7,7 +7,7 @@ AM_INIT_AUTOMAKE([1.10 foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_SRCDIR([value.c]) AC_CONFIG_SRCDIR([value.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([jansson_private_config.h])
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC

39
compat/jansson/jansson_config.h.in

@ -0,0 +1,39 @@
/*
* Copyright (c) 2010-2014 Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
*
*
* This file specifies a part of the site-specific configuration for
* Jansson, namely those things that affect the public API in
* jansson.h.
*
* The configure script copies this file to jansson_config.h and
* replaces @var@ substitutions by values that fit your system. If you
* cannot run the configure script, you can do the value substitution
* by hand.
*/
#ifndef JANSSON_CONFIG_H
#define JANSSON_CONFIG_H
/* If your compiler supports the inline keyword in C, JSON_INLINE is
defined to `inline', otherwise empty. In C++, the inline is always
supported. */
#ifdef __cplusplus
#define JSON_INLINE inline
#else
#define JSON_INLINE @json_inline@
#endif
/* If your compiler supports the `long long` type and the strtoll()
library function, JSON_INTEGER_IS_LONG_LONG is defined to 1,
otherwise to 0. */
#define JSON_INTEGER_IS_LONG_LONG @json_have_long_long@
/* If locale.h and localeconv() are available, define to 1,
otherwise to 0. */
#define JSON_HAVE_LOCALECONV @json_have_localeconv@
#endif

4
compat/jansson/config.h → compat/jansson/jansson_private_config.h

@ -1,5 +1,5 @@
/* config.h. Generated from config.h.in by configure. */ /* jansson_private_config.h. Generated from jansson_private_config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */ /* jansson_private_config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if gcc's __atomic builtins are available */ /* Define to 1 if gcc's __atomic builtins are available */
/* #undef HAVE_ATOMIC_BUILTINS */ /* #undef HAVE_ATOMIC_BUILTINS */

139
compat/jansson/jansson_private_config.h.in

@ -0,0 +1,139 @@
/* jansson_private_config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if gcc's __atomic builtins are available */
#undef HAVE_ATOMIC_BUILTINS
/* Define to 1 if you have the `close' function. */
#undef HAVE_CLOSE
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <endian.h> header file. */
#undef HAVE_ENDIAN_H
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define to 1 if you have the `getpid' function. */
#undef HAVE_GETPID
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `localeconv' function. */
#undef HAVE_LOCALECONV
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if the system has the type `long long int'. */
#undef HAVE_LONG_LONG_INT
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the `open' function. */
#undef HAVE_OPEN
/* Define to 1 if you have the `read' function. */
#undef HAVE_READ
/* Define to 1 if you have the <sched.h> header file. */
#undef HAVE_SCHED_H
/* Define to 1 if you have the `sched_yield' function. */
#undef HAVE_SCHED_YIELD
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the `strtoll' function. */
#undef HAVE_STRTOLL
/* Define to 1 if gcc's __sync builtins are available */
#undef HAVE_SYNC_BUILTINS
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to 1 if /dev/urandom should be used for seeding the hash function */
#undef USE_URANDOM
/* Define to 1 if CryptGenRandom should be used for seeding the hash function
*/
#undef USE_WINDOWS_CRYPTOAPI
/* Version number of package */
#undef VERSION
/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
#define below would cause a syntax error. */
#undef _UINT32_T
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
/* Define to the type of a signed integer type of width exactly 32 bits if
such a type exists and the standard includes do not define it. */
#undef int32_t
/* Define to the type of an unsigned integer type of width exactly 32 bits if
such a type exists and the standard includes do not define it. */
#undef uint32_t

4
compat/jansson/strconv.c

@ -5,9 +5,9 @@
#include "jansson_private.h" #include "jansson_private.h"
#include "strbuffer.h" #include "strbuffer.h"
/* need config.h to get the correct snprintf */ /* need jansson_private_config.h to get the correct snprintf */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include "jansson_private_config.h"
#endif #endif
#if JSON_HAVE_LOCALECONV #if JSON_HAVE_LOCALECONV

2
compat/jansson/utf.h

@ -9,7 +9,7 @@
#define UTF_H #define UTF_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include "jansson_private_config.h"
#ifdef HAVE_INTTYPES_H #ifdef HAVE_INTTYPES_H
/* inttypes.h includes stdint.h in a standard environment, so there's /* inttypes.h includes stdint.h in a standard environment, so there's

Loading…
Cancel
Save