projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a temporary single LttvState container
[lttv.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index e74d4606775d50951849193880ad426a5beaa27e..e93c13cc15dd977364ffa32951b8109c7cedf397 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-48,6
+48,9
@@
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" ])
@@
-114,18
+117,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])
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])
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"
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])
MODULE_CFLAGS="$PACKAGE_CFLAGS -fvisibility=hidden"
MODULE_LDFLAGS="-module -avoid-version"
AC_SUBST([PACKAGE_CFLAGS])
@@
-149,9
+154,9
@@
AC_CHECK_FUNCS([select])
AC_ARG_ENABLE(lttvstatic,
AS_HELP_STRING([--enable-lttvstatic],
[build a statically linked executable [[default=no]]]),
AC_ARG_ENABLE(lttvstatic,
AS_HELP_STRING([--enable-lttvstatic],
[build a statically linked executable [[default=no]]]),
- [
with_lttvstatic="$with
val"],
- [
with_
lttvstatic="no"])
-AM_CONDITIONAL([LTTVSTATIC], [ test "x$
with_
lttvstatic" = "xyes" ] )
+ [
lttvstatic="$enable
val"],
+ [lttvstatic="no"])
+AM_CONDITIONAL([LTTVSTATIC], [ test "x$lttvstatic" = "xyes" ] )
lttvlibdir="${libdir}/lttv"
lttvplugindir="${lttvlibdir}/plugins"
lttvlibdir="${libdir}/lttv"
lttvplugindir="${lttvlibdir}/plugins"
@@
-225,6
+230,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_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.")
AS_ECHO()
AS_ECHO("Type 'make' to build LTTV.")
This page took
0.024959 seconds
and
4
git commands to generate.