Update version to 2.0.0-pre

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d9fa2119d16556c7c8ac0439eb1f170e17511b65..f23e460b757b9e5514bac40a1860a61b695afc78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([babeltrace],[1.3.0-pre],[jeremie dot galarneau at efficios dot com])
+AC_INIT([babeltrace],[2.0.0-pre],[jeremie dot galarneau at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -46,10 +46,21 @@ CC="$PTHREAD_CC"
 AX_APPEND_LINK_FLAGS([-Wl,--no-as-needed], [LD_NO_AS_NEEDED])
 AC_SUBST([LD_NO_AS_NEEDED])
 
-AC_CHECK_HEADERS([fcntl.h limits.h netdb.h netinet/in.h stddef.h sys/socket.h])
+AC_HEADER_STDBOOL
+AC_CHECK_HEADERS([ \
+       fcntl.h \
+       float.h \
+       libintl.h \
+       limits.h \
+       malloc.h \
+       netdb.h \
+       netinet/in.h \
+       stddef.h \
+       sys/socket.h \
+])
 
 if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then
-        if test x"$YACC" != "xbison -y"; then
+        if test x"$(basename "$YACC")" != "xbison -y"; then
                 AC_MSG_ERROR([[bison not found and is required when building from git.
                 Please install bison]])
         fi
@@ -89,12 +100,40 @@ AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 
 # Checks for library functions.
+AC_FUNC_ALLOCA
+AC_FUNC_FORK
 AC_FUNC_MALLOC
+AC_FUNC_MKTIME
 AC_FUNC_MMAP
+AC_FUNC_REALLOC
+AC_FUNC_STRERROR_R
 AC_CHECK_FUNCS([ \
-       gettimeofday munmap strtoul ftruncate gethostbyname \
-       localtime_r memset mkdir rmdir setenv socket \
-       strchr strdup strerror strndup strrchr strtoull tzset \
+       atexit \
+       dirfd \
+       dup2 \
+       ftruncate \
+       gethostbyname \
+       gethostname \
+       gettimeofday \
+       localtime_r \
+       memchr \
+       memset \
+       mkdir \
+       mkdtemp \
+       munmap \
+       rmdir \
+       setenv \
+       socket \
+       strchr \
+       strdup \
+       strerror \
+       strndup \
+       strnlen \
+       strrchr \
+       strtoul \
+       strtoull \
+       tzset \
+       uname \
 ])
 
 # Check for MinGW32.
@@ -228,9 +267,12 @@ PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
 AC_SUBST(PACKAGE_LIBS)
 
 LIBS="$LIBS $GMODULE_LIBS"
-PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat -include config.h"
+PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat"
 AC_SUBST(PACKAGE_CFLAGS)
 
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/include -include config.h"
+AC_SUBST(DEFAULT_INCLUDES)
+
 babeltraceincludedir="${includedir}/babeltrace"
 AC_SUBST(babeltraceincludedir)