X-Git-Url: http://git.liburcu.org/?p=lttv.git;a=blobdiff_plain;f=configure.ac;h=2af9ebecf9e887dda74c320bccadbf32ba85b496;hp=e5c110cc2dcb3aecb9c777475261e3ef7f1dc002;hb=979bddf1cd8bb5268014f566e92f333a3e48b819;hpb=76b647abb4c9713e046ea2f3e2c0bec043c99023

diff --git a/configure.ac b/configure.ac
index e5c110cc..2af9ebec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,25 +29,15 @@ 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" ])
 
@@ -114,18 +104,20 @@ 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"
+# Todo add test for babeltrace pkg-config
+BABELTRACE_LIBS="-lbabeltrace -lbabeltrace-ctf"
+
+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])
@@ -177,6 +169,8 @@ AC_SUBST(lttvincludedir)
 AC_SUBST(lttvwindowincludedir)
 AC_SUBST(lttctlincludedir)
 
+#	ltt/Makefile
+
 AC_CONFIG_FILES([Makefile
 	lttv/Makefile
 	lttv/lttv/Makefile
@@ -195,7 +189,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