X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=23430881d2594df61a9f5b65538c215de4a3dd83;hb=8284135eaaf40b6d7897c63a59a7df0b7f0cd2c7;hp=e93c13cc15dd977364ffa32951b8109c7cedf397;hpb=33cc940080732f7d403b90c7cbfa8514fe1fd83f;p=lttv.git

diff --git a/configure.ac b/configure.ac
index e93c13cc..23430881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,28 +29,12 @@ AM_SILENT_RULES([yes])
 AC_CONFIG_HEADERS([config.h])
 LT_INIT
 
-# If requested, only build the ltt trace reading library
-AC_ARG_WITH(lttv,
-	AS_HELP_STRING([--with-lttv],
-	[build whole LTTV system, as opposd to only the trace reading library [[default=yes]]]),
-	[with_lttv="$withval"],
-	[with_lttv="yes"])
-
-# If we've requested the lib only, turn off the lttv-gui building as well
-AS_IF([test "x$with_lttv" = "xno"], [with_lttv_gui="no"])
-
-AM_CONDITIONAL([BUILD_LIB_ONLY], [ test "x$with_lttv" = "xno" ])
-
-
 # If requested, avoid building LTTV part
 AC_ARG_WITH(lttv-gui,
 	AS_HELP_STRING([--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" ])
 
@@ -125,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.0.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"
@@ -182,6 +171,8 @@ AC_SUBST(lttvincludedir)
 AC_SUBST(lttvwindowincludedir)
 AC_SUBST(lttctlincludedir)
 
+#	ltt/Makefile
+
 AC_CONFIG_FILES([Makefile
 	lttv/Makefile
 	lttv/lttv/Makefile
@@ -200,7 +191,6 @@ AC_CONFIG_FILES([Makefile
 	lttv/modules/gui/filter/Makefile
 	lttv/modules/gui/tracecontrol/Makefile
 	lttv/modules/gui/resourceview/Makefile
-	ltt/Makefile
 	doc/Makefile
 	doc/developer/Makefile
 	doc/developer/developer_guide/Makefile