projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test that we really have libbabeltrace-ctf
[lttv.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index e1d04d0588d2e9372be3c1002420c847ef9861a5..5d79fb57cbe6d9083c35b2b30f7bffa5ae4d6762 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-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"])
[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" ])
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])
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],
+ [], [])
LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS $GMODULE_LIBS $BABELTRACE_LIBS"
PACKAGE_CFLAGS="$GTK_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS -Wall -Wformat-security"
LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS $GMODULE_LIBS $BABELTRACE_LIBS"
PACKAGE_CFLAGS="$GTK_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS -Wall -Wformat-security"
This page took
0.022137 seconds
and
4
git commands to generate.