* [lttng-dev] [lttng-tools PATCH 1/2] Cleanup configure.ac
@ 2011-11-30 0:04 Alexandre Montplaisir
2011-11-30 0:04 ` [lttng-dev] [lttng-tools PATCH 2/2] Add a --with-consumerd-only configure option Alexandre Montplaisir
2011-11-30 0:17 ` [lttng-dev] [lttng-tools PATCH 1/2] Cleanup configure.ac Mathieu Desnoyers
0 siblings, 2 replies; 4+ messages in thread
From: Alexandre Montplaisir @ 2011-11-30 0:04 UTC (permalink / raw)
Use AS_IF() and AS_ECHO() macros whenever possible.
Print the configuration options at the end of the script
(so they don't get lost in the sea of the configure output).
Signed-off-by: Alexandre Montplaisir <alexandre.montplaisir at gmail.com>
---
configure.ac | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index b73cf0f..01e15d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,21 +85,14 @@ AC_CHECK_DECL([caa_likely], [],
# Check liblttng-ust-ctl library
AC_ARG_ENABLE(lttng-ust,
- [ --disable-lttng-ust build without LTTng-UST (Userspace Tracing) support.],
+ AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),
lttng_ust_support=$enableval, lttng_ust_support=yes)
-[
-if test "x$lttng_ust_support" = "xno"; then
- echo "LTTng-UST support disabled."
-else
-]
+AS_IF([test "x$lttng_ust_support" = "xyes"], [
AC_CHECK_LIB([lttng-ust-ctl], [ustctl_create_session], [],
[AC_MSG_ERROR([Cannot find LTTng-UST. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])]
)
-[
- echo "LTTng-UST support enabled."
-fi
-]
+])
AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
@@ -146,3 +139,13 @@ AC_CONFIG_FILES([
])
AC_OUTPUT
+
+# Mini-report on what will be built
+AS_ECHO("")
+
+AS_ECHO_N("Lttng-UST support: ")
+AS_IF([test "x$lttng_ust_support" = "xyes"], [AS_ECHO("Enabled")],
+ [AS_ECHO("Disabled")])
+
+AS_ECHO("")
+
--
1.7.7.3
^ permalink raw reply [flat|nested] 4+ messages in thread* [lttng-dev] [lttng-tools PATCH 2/2] Add a --with-consumerd-only configure option
2011-11-30 0:04 [lttng-dev] [lttng-tools PATCH 1/2] Cleanup configure.ac Alexandre Montplaisir
@ 2011-11-30 0:04 ` Alexandre Montplaisir
2011-11-30 0:18 ` Mathieu Desnoyers
2011-11-30 0:17 ` [lttng-dev] [lttng-tools PATCH 1/2] Cleanup configure.ac Mathieu Desnoyers
1 sibling, 1 reply; 4+ messages in thread
From: Alexandre Montplaisir @ 2011-11-30 0:04 UTC (permalink / raw)
This will only build the consumer daemon (and its liblttng-consumer
library), and skip the lttng and lttng-sessiond binaries.
This will be useful when a user wants to support both 32-bit and
64-bit applications on the same system. Only one sessiond is
needed, but we need a consumer for each architecture.
Signed-off-by: Alexandre Montplaisir <alexandre.montplaisir at gmail.com>
---
Makefile.am | 18 +++++++++++-------
configure.ac | 15 ++++++++++++++-
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 44f1714..fa5beea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,14 @@ SUBDIRS = liblttng-sessiond-comm \
liblttng-kconsumer \
liblttng-ustconsumer \
liblttng-consumer \
- lttng-consumerd \
- liblttngctl \
- lttng \
- lttng-sessiond \
- tests \
- include \
- doc
+ lttng-consumerd
+
+if ! BUILD_CONSUMERD_ONLY
+SUBDIRS += liblttngctl \
+ lttng \
+ lttng-sessiond
+endif
+
+SUBDIRS += tests \
+ include \
+ doc
diff --git a/configure.ac b/configure.ac
index 01e15d3..621f091 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,13 @@ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl
AC_CHECK_FUNCS([sched_getcpu sysconf])
+# Option to only build the consumer daemon and its libraries
+AC_ARG_WITH([consumerd-only],
+ AS_HELP_STRING([--with-consumerd-only],[Only build the consumer daemon [default=no]]),
+ [consumerd_only=$withval],
+ [consumerd_only=no])
+AM_CONDITIONAL([BUILD_CONSUMERD_ONLY], [test "x$consumerd_only" = "xyes"])
+
# Epoll check. If not present, the build will fallback on poll() API
AX_HAVE_EPOLL(
[AX_CONFIG_FEATURE_ENABLE(epoll)],
@@ -145,7 +152,13 @@ AS_ECHO("")
AS_ECHO_N("Lttng-UST support: ")
AS_IF([test "x$lttng_ust_support" = "xyes"], [AS_ECHO("Enabled")],
- [AS_ECHO("Disabled")])
+ [AS_ECHO("Disabled")]
+)
+
+AS_IF([test "x$consumerd_only" = "xyes"],
+ [AS_ECHO("Only the consumerd daemon will be built.")],
+ [AS_ECHO("All binaries will be built.")]
+)
AS_ECHO("")
--
1.7.7.3
^ permalink raw reply [flat|nested] 4+ messages in thread* [lttng-dev] [lttng-tools PATCH 2/2] Add a --with-consumerd-only configure option
2011-11-30 0:04 ` [lttng-dev] [lttng-tools PATCH 2/2] Add a --with-consumerd-only configure option Alexandre Montplaisir
@ 2011-11-30 0:18 ` Mathieu Desnoyers
0 siblings, 0 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2011-11-30 0:18 UTC (permalink / raw)
* Alexandre Montplaisir (alexandre.montplaisir at gmail.com) wrote:
> This will only build the consumer daemon (and its liblttng-consumer
> library), and skip the lttng and lttng-sessiond binaries.
>
> This will be useful when a user wants to support both 32-bit and
> 64-bit applications on the same system. Only one sessiond is
> needed, but we need a consumer for each architecture.
merged, thanks!
Mathieu
>
> Signed-off-by: Alexandre Montplaisir <alexandre.montplaisir at gmail.com>
> ---
> Makefile.am | 18 +++++++++++-------
> configure.ac | 15 ++++++++++++++-
> 2 files changed, 25 insertions(+), 8 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 44f1714..fa5beea 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -5,10 +5,14 @@ SUBDIRS = liblttng-sessiond-comm \
> liblttng-kconsumer \
> liblttng-ustconsumer \
> liblttng-consumer \
> - lttng-consumerd \
> - liblttngctl \
> - lttng \
> - lttng-sessiond \
> - tests \
> - include \
> - doc
> + lttng-consumerd
> +
> +if ! BUILD_CONSUMERD_ONLY
> +SUBDIRS += liblttngctl \
> + lttng \
> + lttng-sessiond
> +endif
> +
> +SUBDIRS += tests \
> + include \
> + doc
> diff --git a/configure.ac b/configure.ac
> index 01e15d3..621f091 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -98,6 +98,13 @@ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl
>
> AC_CHECK_FUNCS([sched_getcpu sysconf])
>
> +# Option to only build the consumer daemon and its libraries
> +AC_ARG_WITH([consumerd-only],
> + AS_HELP_STRING([--with-consumerd-only],[Only build the consumer daemon [default=no]]),
> + [consumerd_only=$withval],
> + [consumerd_only=no])
> +AM_CONDITIONAL([BUILD_CONSUMERD_ONLY], [test "x$consumerd_only" = "xyes"])
> +
> # Epoll check. If not present, the build will fallback on poll() API
> AX_HAVE_EPOLL(
> [AX_CONFIG_FEATURE_ENABLE(epoll)],
> @@ -145,7 +152,13 @@ AS_ECHO("")
>
> AS_ECHO_N("Lttng-UST support: ")
> AS_IF([test "x$lttng_ust_support" = "xyes"], [AS_ECHO("Enabled")],
> - [AS_ECHO("Disabled")])
> + [AS_ECHO("Disabled")]
> +)
> +
> +AS_IF([test "x$consumerd_only" = "xyes"],
> + [AS_ECHO("Only the consumerd daemon will be built.")],
> + [AS_ECHO("All binaries will be built.")]
> +)
>
> AS_ECHO("")
>
> --
> 1.7.7.3
>
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
>
--
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [lttng-dev] [lttng-tools PATCH 1/2] Cleanup configure.ac
2011-11-30 0:04 [lttng-dev] [lttng-tools PATCH 1/2] Cleanup configure.ac Alexandre Montplaisir
2011-11-30 0:04 ` [lttng-dev] [lttng-tools PATCH 2/2] Add a --with-consumerd-only configure option Alexandre Montplaisir
@ 2011-11-30 0:17 ` Mathieu Desnoyers
1 sibling, 0 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2011-11-30 0:17 UTC (permalink / raw)
* Alexandre Montplaisir (alexandre.montplaisir at gmail.com) wrote:
> Use AS_IF() and AS_ECHO() macros whenever possible.
> Print the configuration options at the end of the script
> (so they don't get lost in the sea of the configure output).
Merged, thanks!
Mathieu
>
> Signed-off-by: Alexandre Montplaisir <alexandre.montplaisir at gmail.com>
> ---
> configure.ac | 23 +++++++++++++----------
> 1 files changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index b73cf0f..01e15d3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -85,21 +85,14 @@ AC_CHECK_DECL([caa_likely], [],
>
> # Check liblttng-ust-ctl library
> AC_ARG_ENABLE(lttng-ust,
> - [ --disable-lttng-ust build without LTTng-UST (Userspace Tracing) support.],
> + AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),
> lttng_ust_support=$enableval, lttng_ust_support=yes)
>
> -[
> -if test "x$lttng_ust_support" = "xno"; then
> - echo "LTTng-UST support disabled."
> -else
> -]
> +AS_IF([test "x$lttng_ust_support" = "xyes"], [
> AC_CHECK_LIB([lttng-ust-ctl], [ustctl_create_session], [],
> [AC_MSG_ERROR([Cannot find LTTng-UST. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])]
> )
> -[
> - echo "LTTng-UST support enabled."
> -fi
> -]
> +])
>
> AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
>
> @@ -146,3 +139,13 @@ AC_CONFIG_FILES([
> ])
>
> AC_OUTPUT
> +
> +# Mini-report on what will be built
> +AS_ECHO("")
> +
> +AS_ECHO_N("Lttng-UST support: ")
> +AS_IF([test "x$lttng_ust_support" = "xyes"], [AS_ECHO("Enabled")],
> + [AS_ECHO("Disabled")])
> +
> +AS_ECHO("")
> +
> --
> 1.7.7.3
>
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
>
--
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-30 0:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-30 0:04 [lttng-dev] [lttng-tools PATCH 1/2] Cleanup configure.ac Alexandre Montplaisir
2011-11-30 0:04 ` [lttng-dev] [lttng-tools PATCH 2/2] Add a --with-consumerd-only configure option Alexandre Montplaisir
2011-11-30 0:18 ` Mathieu Desnoyers
2011-11-30 0:17 ` [lttng-dev] [lttng-tools PATCH 1/2] Cleanup configure.ac Mathieu Desnoyers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox