X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=cabc7324f98c0bc40e26f65f169b3c6d60924c49;hb=198d537be76ae4debaac7f730bb2c591b04ab1df;hp=6d21268e903c562420f29f8386ff1b1833a2c6d6;hpb=49880cbabeb597a9c748a3d5f37e9961a084dce3;p=jansson.git

diff --git a/configure.ac b/configure.ac
index 6d21268..cabc732 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_PREREQ([2.59])
-AC_INIT([jansson], [1.2+], [petri@digip.org])
+AC_PREREQ([2.60])
+AC_INIT([jansson], [2.0pre], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 
@@ -8,8 +8,8 @@ AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_CXX
 AC_PROG_LIBTOOL
+AM_CONDITIONAL([GCC], [test x$GCC = xyes])
 
 # Checks for libraries.
 
@@ -18,6 +18,21 @@ AC_PROG_LIBTOOL
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_INT32_T
 
+AC_TYPE_LONG_LONG_INT
+case $ac_cv_type_long_long_int in
+     yes) json_have_long_long=1;;
+     *) json_have_long_long=0;;
+esac
+AC_SUBST([json_have_long_long])
+
+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 +40,7 @@ AC_CONFIG_FILES([
         Makefile
         doc/Makefile
         src/Makefile
+        src/jansson_config.h
         test/Makefile
         test/bin/Makefile
         test/suites/Makefile