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
29d61ed
..
a42a99c
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,5
+1,5
@@
-AC_PREREQ([2.
59
])
-AC_INIT([jansson], [1.
1.1
], [petri@digip.org])
+AC_PREREQ([2.
60
])
+AC_INIT([jansson], [1.
2.1+
], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])
AM_INIT_AUTOMAKE([1.10 foreign])
@@
-8,6
+8,7
@@
AC_CONFIG_HEADERS([config.h])
# Checks for programs.
AC_PROG_CC
# Checks for programs.
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_LIBTOOL
# Checks for libraries.
AC_PROG_LIBTOOL
# Checks for libraries.
@@
-15,15
+16,27
@@
AC_PROG_LIBTOOL
# Checks for header files.
# Checks for typedefs, structures, and compiler characteristics.
# Checks for header files.
# 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([
+ jansson.pc
Makefile
doc/Makefile
src/Makefile
Makefile
doc/Makefile
src/Makefile
+ src/jansson.h
test/Makefile
test/Makefile
- test/testdata/Makefile
- test/testprogs/Makefile
+ test/bin/Makefile
+ test/suites/Makefile
+ test/suites/api/Makefile
])
AC_OUTPUT
])
AC_OUTPUT