X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=be3f06edbb8875975d4b3bad1b1436d28f68e428;hb=c3dbb31bb9c3aea21bb955ca3600c586d926bf3c;hp=31655949ac67ec0a573dca26a555378549db8182;hpb=be32e4b2bc75e7937ef3841e6c9b6b88aaf237ec;p=lttv.git

diff --git a/configure.ac b/configure.ac
index 31655949..be3f06ed 100644
--- 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])
@@ -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,34 @@ 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.1.0], [], 
+			      [AC_CHECK_LIB([babeltrace], [bt_context_create], [],
+             [AC_MSG_ERROR([Cannot find the babeltrace library.])]
+             )
+
+# Check for libbabeltrace-ctf
+AC_CHECK_LIB([babeltrace-ctf], [bt_ctf_iter_create], [],
+             [AC_MSG_ERROR([Cannot find the babeltrace-ctf library.])]
+             )
+])
+
+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 +152,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,25 +180,21 @@ AC_SUBST(lttvincludedir)
 AC_SUBST(lttvwindowincludedir)
 AC_SUBST(lttctlincludedir)
 
+#	ltt/Makefile
+
 AC_CONFIG_FILES([Makefile
 	lttv/Makefile
 	lttv/lttv/Makefile
-	lttv/lttv/sync/Makefile
 	lttv/modules/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
-	ltt/Makefile
 	doc/Makefile
 	doc/developer/Makefile
 	doc/developer/developer_guide/Makefile
@@ -205,6 +204,36 @@ AC_CONFIG_FILES([Makefile
 	doc/user/user_guide/Makefile
 	doc/user/user_guide/docbook/Makefile
 	doc/user/user_guide/html/Makefile])
+#	lttv/lttv/sync/Makefile
+#	lttv/modules/gui/interrupts/Makefile
+#	lttv/modules/gui/statistics/Makefile
+#	lttv/modules/gui/filter/Makefile
+#	lttv/modules/gui/tracecontrol/Makefile
+
 
 AC_OUTPUT
 
+# Report on what will be built
+AS_ECHO()
+AS_ECHO("The following components will be built:")
+AS_ECHO("LTT trace reading library: Enabled") # It's always enabled!
+
+AS_ECHO_N("LTTV command line tool:    ")
+AS_IF([test "x$with_lttv" = "xyes"],[AS_ECHO("Enabled")],[AS_ECHO("Disabled")])
+
+AS_ECHO_N("LTTV graphical interface:  ")
+AS_IF([test "x$with_lttv_gui" = "xyes"],[AS_ECHO("Enabled")],[AS_ECHO("Disabled")])
+
+AS_ECHO_N("Trace synchronization:     ")
+AS_IF([test "x$with_trace_sync" = "xyes"],[AS_ECHO("Enabled")],[AS_ECHO("Disabled")])
+
+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.")
+