X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=df5584592bd00ce5fdad543975dbbd640defb1ef;hb=73ccabb38349b1a44556c57f1bf36fb94be45628;hp=e74d4606775d50951849193880ad426a5beaa27e;hpb=67c06453b1a52601530f4d41f3771e32a6d98190;p=lttv.git

diff --git a/configure.ac b/configure.ac
index e74d4606..df558459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,18 +114,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])
@@ -149,9 +151,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"
@@ -225,6 +227,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.")