diff options
| author | Petri Lehtinen <petri@digip.org> | 2010-03-28 21:44:41 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2010-03-28 21:44:41 +0300 |
| commit | 4e63fcd55d874485071073f181dbfc5b9e196600 (patch) | |
| tree | 8c1aa0262a7ee2cdd6cc5c56b06b76660fd2d45e /configure.ac | |
| parent | 49880cbabeb597a9c748a3d5f37e9961a084dce3 (diff) | |
| parent | 024106bbfbd7376656876aa8bd00a333d5ada10c (diff) | |
| download | jansson-4e63fcd55d874485071073f181dbfc5b9e196600.zip jansson-4e63fcd55d874485071073f181dbfc5b9e196600.tar.gz jansson-4e63fcd55d874485071073f181dbfc5b9e196600.tar.bz2 | |
Merge branch '1.2'
Conflicts:
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6d21268..9a4bd99 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.59]) +AC_PREREQ([2.60]) AC_INIT([jansson], [1.2+], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) @@ -18,6 +18,14 @@ AC_PROG_LIBTOOL # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_INT32_T +AC_C_INLINE +case $ac_cv_c_inline in + yes) json_inline=inline;; + no) json_inline=;; + *) json_inline=$ac_cv_c_inline;; +esac +AC_SUBST([json_inline]) + # Checks for library functions. AC_CONFIG_FILES([ @@ -25,6 +33,7 @@ AC_CONFIG_FILES([ Makefile doc/Makefile src/Makefile + src/jansson.h test/Makefile test/bin/Makefile test/suites/Makefile |