X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=2241681c7ac7d90188a2e6c51a71322fac6ee2b0;hp=64cea932174845f9c2e1dd250df7b9a33d5c27e7;hb=842c2b97eab577484edae763770dfd1440490818;hpb=fd55fc57942d179105ddda100a5341f9aacdf5c0 diff --git a/configure.ac b/configure.ac index 64cea932..2241681c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([babeltrace], [0.1], [mathieu dot desnoyers at efficios dot com]) +AC_INIT([babeltrace],[0.8],[mathieu dot desnoyers at efficios dot com]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -17,13 +17,13 @@ AC_CONFIG_HEADERS([config.h]) # Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET -AC_PROG_LIBTOOL +LT_INIT AC_PROG_YACC AC_PROG_LEX AC_DEFUN([AC_PROG_BISON], [AC_CHECK_PROGS(BISON, bison, bison)]) -AM_PATH_GLIB_2_0(2.4.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule) +AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE @@ -40,6 +40,10 @@ AC_CHECK_LIB([uuid], [uuid_generate], [], [AC_MSG_ERROR([Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its location.])] ) +AC_CHECK_LIB([popt], [poptGetContext], [], + [AC_MSG_ERROR([Cannot find popt.])] +) + pkg_modules="gmodule-2.0 >= 2.0.0" PKG_CHECK_MODULES(GMODULE, [$pkg_modules]) AC_SUBST(PACKAGE_LIBS) @@ -48,14 +52,23 @@ LIBS="$LIBS $GMODULE_LIBS" PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat" AC_SUBST(PACKAGE_CFLAGS) +babeltraceincludedir="${includedir}/babeltrace" +AC_SUBST(babeltraceincludedir) + AC_CONFIG_FILES([ Makefile types/Makefile formats/Makefile formats/ctf/Makefile formats/ctf/types/Makefile + formats/ctf-text/Makefile + formats/ctf-text/types/Makefile + formats/bt-dummy/Makefile formats/ctf/metadata/Makefile converter/Makefile + lib/Makefile + lib/prio_heap/Makefile + include/Makefile tests/Makefile ]) AC_OUTPUT