X-Git-Url: http://git.lttng.org/?p=lttv.git;a=blobdiff_plain;f=configure.ac;h=23430881d2594df61a9f5b65538c215de4a3dd83;hp=e74d4606775d50951849193880ad426a5beaa27e;hb=9b55aba047555ab16b23b0d94002826c204bb715;hpb=67c06453b1a52601530f4d41f3771e32a6d98190

diff --git a/configure.ac b/configure.ac
index e74d4606..23430881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,19 +29,6 @@ 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],
@@ -114,18 +101,25 @@ AM_CONDITIONAL([BUILD_JNI_INTERFACE], [ test "$with_jni_interface" = "yes" ] )
 AS_IF([test "x$with_lttv_gui" = "xyes"],[
 	pkg_modules="gtk+-2.0 >= 2.0.0"
 	PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-],[
-	# Else, we still have a dependency on gmodule
-	# We will add flags for gmodule alone
-	pkg_modules="gmodule-2.0 >= 2.0.0"
-	PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
 ])
 
+pkg_modules="gmodule-2.0 >= 2.0.0"
+PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
+
 pkg_modules="gobject-2.0 >= 2.0.0"
 PKG_CHECK_MODULES(GOBJECT, [$pkg_modules])
 
-LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS $GMODULE_LIBS"
+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"
+
 MODULE_CFLAGS="$PACKAGE_CFLAGS -fvisibility=hidden"
 MODULE_LDFLAGS="-module -avoid-version"
 AC_SUBST([PACKAGE_CFLAGS])
@@ -149,9 +143,9 @@ AC_CHECK_FUNCS([select])
 AC_ARG_ENABLE(lttvstatic,
 	AS_HELP_STRING([--enable-lttvstatic],
 	[build a statically linked executable [[default=no]]]),
-	[with_lttvstatic="$withval"],
-	[with_lttvstatic="no"])
-AM_CONDITIONAL([LTTVSTATIC], [ test "x$with_lttvstatic" = "xyes" ] )
+	[lttvstatic="$enableval"],
+	[lttvstatic="no"])
+AM_CONDITIONAL([LTTVSTATIC], [ test "x$lttvstatic" = "xyes" ] )
 
 lttvlibdir="${libdir}/lttv"
 lttvplugindir="${lttvlibdir}/plugins"
@@ -177,6 +171,8 @@ AC_SUBST(lttvincludedir)
 AC_SUBST(lttvwindowincludedir)
 AC_SUBST(lttctlincludedir)
 
+#	ltt/Makefile
+
 AC_CONFIG_FILES([Makefile
 	lttv/Makefile
 	lttv/lttv/Makefile
@@ -195,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
@@ -225,6 +220,10 @@ AS_IF([test "x$with_trace_sync" = "xyes"],[AS_ECHO("Enabled")],[AS_ECHO("Disable
 AS_ECHO_N("Java (JNI) interface:      ")
 AS_IF([test "x$with_jni_interface" = "xyes"],[AS_ECHO("Enabled")],[AS_ECHO("Disabled")])
 
+AS_ECHO()
+AS_ECHO_N("Statically linked executable: ")
+AS_IF([test "x$lttvstatic" = "xyes"],[AS_ECHO("Yes")],[AS_ECHO("No")])
+
 AS_ECHO()
 AS_ECHO("Type 'make' to build LTTV.")