X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=4a199e40beb56835d1e4cf7e74226d6251c248de;hb=2caac965d4f675b51815be4a5ae1f305587be911;hp=3a359450be0ffc2b48a6494fc61f4fce1e1ac111;hpb=d1b07171cc1e54addfdc18b2d528487596ff535d;p=jansson.git diff --git a/configure.ac b/configure.ac index 3a35945..4a199e4 100644 --- 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.3], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) @@ -8,6 +8,7 @@ AC_CONFIG_HEADERS([config.h]) # Checks for programs. AC_PROG_CC +AC_PROG_CXX AC_PROG_LIBTOOL # Checks for libraries. @@ -15,15 +16,27 @@ AC_PROG_LIBTOOL # 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([ + jansson.pc Makefile doc/Makefile src/Makefile + src/jansson.h test/Makefile - test/testdata/Makefile - test/testprogs/Makefile + test/bin/Makefile + test/suites/Makefile + test/suites/api/Makefile ]) AC_OUTPUT