-AC_INIT([lttng-tools],[2.0-pre17],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.0.0-rc1],[dgoulet@efficios.com],[],[http://lttng.org])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
])
+# Babeltrace viewer check
+AC_ARG_WITH([babeltrace-bin],
+ AS_HELP_STRING([--with-babeltrace-bin],
+ [Location of the babeltrace viewer executable (including the filename)]),
+ [BABELTRACE_BIN="$withval"],
+ [BABELTRACE_BIN=''])
+AC_SUBST([BABELTRACE_BIN])
+
+# lttv-gui
+AC_ARG_WITH([lttv-gui-bin],
+ AS_HELP_STRING([--with-lttv-gui-bin],
+ [Location of the lttv GUI viewer executable (including the filename)]),
+ [LTTV_GUI_BIN="$withval"],
+ [LTTV_GUI_BIN=''])
+AC_SUBST([LTTV_GUI_BIN])
+
AC_ARG_WITH([consumerd32-bin],
AS_HELP_STRING([--with-consumerd32-bin],
[Location of the 32-bit consumerd executable (including the filename)]),
[CONSUMERD32_LIBDIR=''])
AC_SUBST([CONSUMERD32_LIBDIR])
-AC_ARG_WITH([consumer64d-libdir],
+AC_ARG_WITH([consumerd64-libdir],
AS_HELP_STRING([--with-consumerd64-libdir],
[Directory containing the 64-bit consumerd libraries]),
[CONSUMERD64_LIBDIR="$withval"],
AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_BIN], "$CONSUMERD64_BIN", [Location of the 64-bit consumerd executable])
AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_LIBDIR], "$CONSUMERD32_LIBDIR", [Search for consumerd 32-bit libraries in this location.])
AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_LIBDIR], "$CONSUMERD64_LIBDIR", [Search for consumerd 64-bit libraries in this location.])
+AC_DEFINE_UNQUOTED([CONFIG_BABELTRACE_BIN], "$BABELTRACE_BIN", [Location of the babeltrace viewer executable.])
+AC_DEFINE_UNQUOTED([CONFIG_LTTV_GUI_BIN], "$LTTV_GUI_BIN", [Location of the lttv GUI viewer executable.])
# Check for pthread
AC_CHECK_LIB([pthread], [pthread_create], [],
AC_CONFIG_FILES([
Makefile
doc/Makefile
+ doc/man/Makefile
include/Makefile
src/Makefile
src/common/Makefile