Put includes in the right section

[lttv.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2af9ebecf9e887dda74c320bccadbf32ba85b496..59338a27d567f08e3182b9a222d6256fbde86243 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([lttv], [0.12.38-21032011], [yannick.brosseau@gmail.com])
+AC_INIT([lttv], [1.5-beta1], [yannick.brosseau@gmail.com])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
@@ -35,9 +35,6 @@ AC_ARG_WITH(lttv-gui,
        [build LTTV gui, as opposed to only build textmode LTTV [[default=yes]]]),
        [with_lttv_gui="$withval"],
        [with_lttv_gui="yes"])
-#TODO ybrosseau 2012-03-13: Remove this when babeltrace port is complete
-#Force GUI disabling while we port babeltrace
-#with_lttv_gui="no"
 
 AM_CONDITIONAL([BUILD_LTTV_GUI], [ test "x$with_lttv_gui" = "xyes" ])
 
@@ -112,8 +109,13 @@ PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
 pkg_modules="gobject-2.0 >= 2.0.0"
 PKG_CHECK_MODULES(GOBJECT, [$pkg_modules])
 
-# Todo add test for babeltrace pkg-config
-BABELTRACE_LIBS="-lbabeltrace -lbabeltrace-ctf"
+PKG_CHECK_MODULES(BABELTRACE, [babeltrace >= 1.1.0])
+
+AC_CHECK_LIB([babeltrace], [bt_iter_equals_pos], 
+                          [AC_DEFINE([HAVE_BT_ITER_EQUALS_POS],[],[Have equal function])], [])
+
+AC_CHECK_LIB([babeltrace-ctf], [bt_ctf_event_name], 
+                          [], [AC_MSG_ERROR([libbabeltrace-ctf is required in order to compile LTTV])])
 
 LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS $GMODULE_LIBS $BABELTRACE_LIBS"
 PACKAGE_CFLAGS="$GTK_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS -Wall -Wformat-security"
@@ -179,15 +181,11 @@ AC_CONFIG_FILES([Makefile
        lttv/modules/text/Makefile
        lttv/modules/gui/Makefile
        lttv/modules/gui/lttvwindow/Makefile
-       lttv/modules/gui/interrupts/Makefile
        lttv/modules/gui/lttvwindow/lttvwindow/Makefile
        lttv/modules/gui/lttvwindow/pixmaps/Makefile
        lttv/modules/gui/controlflow/Makefile
        lttv/modules/gui/detailedevents/Makefile
-       lttv/modules/gui/statistics/Makefile
        lttv/modules/gui/histogram/Makefile
-       lttv/modules/gui/filter/Makefile
-       lttv/modules/gui/tracecontrol/Makefile
        lttv/modules/gui/resourceview/Makefile
        doc/Makefile
        doc/developer/Makefile
@@ -198,6 +196,11 @@ AC_CONFIG_FILES([Makefile
        doc/user/user_guide/Makefile
        doc/user/user_guide/docbook/Makefile
        doc/user/user_guide/html/Makefile])
+#      lttv/modules/gui/interrupts/Makefile
+#      lttv/modules/gui/statistics/Makefile
+#      lttv/modules/gui/filter/Makefile
+#      lttv/modules/gui/tracecontrol/Makefile
+
 
 AC_OUTPUT