projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1.2'
[jansson.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
6d21268
..
9a4bd99
100644
(file)
--- 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])
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
# 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([
# Checks for library functions.
AC_CONFIG_FILES([
@@
-25,6
+33,7
@@
AC_CONFIG_FILES([
Makefile
doc/Makefile
src/Makefile
Makefile
doc/Makefile
src/Makefile
+ src/jansson.h
test/Makefile
test/bin/Makefile
test/suites/Makefile
test/Makefile
test/bin/Makefile
test/suites/Makefile