<div dir="ltr">Hmm, I agree the 3+ patch split might be a better idea; as for the 'generalized coding style', it was more of a parenthesis usage & positionning cleanup to make sure the same style was applied everywhere (I tried to pick whatever style was the most present at the time). There were a lot of floating brackets here and there, and some function arguments were not properly tabbed. These changes fixed most (?) of these issues while keeping readability in mind.<div>
<br></div><div style>We'll get working on all these fixes in the next few days, but for now, thanks for the comments!</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, May 6, 2013 at 3:28 PM, Mathieu Desnoyers <span dir="ltr"><<a href="mailto:mathieu.desnoyers@efficios.com" target="_blank">mathieu.desnoyers@efficios.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">* David Goulet (<a href="mailto:dgoulet@efficios.com">dgoulet@efficios.com</a>) wrote:<br>
> Why?<br>
<br>
cleaning up the <a href="http://configure.ac" target="_blank">configure.ac</a> is a good thing. However, this patch should<br>
probably be split into 3 patches.<br>
<br>
1) Cleanup: <a href="http://configure.ac" target="_blank">configure.ac</a>: replace space indents by tabs<br>
2) Cleanup: <a href="http://configure.ac" target="_blank">configure.ac</a>: regroup AC_ARG_WITH<br>
3) Error message fix: <a href="http://configure.ac" target="_blank">configure.ac</a>: fix bad AS_HELP_STRING<br>
<br>
Not sure about "generalized coding style" though. It might require more<br>
explanation.<br>
<br>
Thanks,<br>
<br>
Mathieu<br>
<div><div class="h5"><br>
><br>
> Thanks!<br>
> David<br>
><br>
> Charles Briere:<br>
> > From: Pierre-Luc St-Charles <<a href="mailto:pierre-luc.st-charles@polymtl.ca">pierre-luc.st-charles@polymtl.ca</a>><br>
> ><br>
> > Signed-off-by: Pierre-Luc St-Charles <<a href="mailto:pierre-luc.st-charles@polymtl.ca">pierre-luc.st-charles@polymtl.ca</a>><br>
> > ---<br>
> > <a href="http://configure.ac" target="_blank">configure.ac</a> | 315 ++++++++++++++++++++++++++++++++---------------------------<br>
> > 1 file changed, 171 insertions(+), 144 deletions(-)<br>
> ><br>
> > diff --git a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
> > index 154b0a7..e4d2c6f 100644<br>
> > --- a/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
> > +++ b/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
> > @@ -17,27 +17,32 @@ AC_CONFIG_HEADERS([include/config.h])<br>
> > AC_PROG_GREP<br>
> > # libtool link_all_deplibs fixup. See <a href="http://bugs.lttng.org/issues/321" target="_blank">http://bugs.lttng.org/issues/321</a>.<br>
> > AC_ARG_ENABLE(libtool-linkdep-fixup,<br>
> > - AS_HELP_STRING([--disable-libtool-linkdep-fixup],<br>
> > - [disable the libtool fixup for linking all dependent libraries (link_all_deplibs)]),<br>
> > - libtool_fixup=$enableval,<br>
> > - libtool_fixup=yes)<br>
> > +[<br>
> > + AS_HELP_STRING([--disable-libtool-linkdep-fixup],[disable the libtool fixup for linking all dependent libraries (link_all_deplibs)])<br>
> > +],<br>
> > +[<br>
> > + libtool_fixup=$enableval<br>
> > +],<br>
> > +[<br>
> > + libtool_fixup=yes<br>
> > +])<br>
> ><br>
> > AS_IF([test "x$libtool_fixup" = "xyes"],<br>
> > - [<br>
> > - libtool_m4="$srcdir/config/libtool.m4"<br>
> > - libtool_flag_pattern=".*link_all_deplibs\s*,\s*\$1\s*)"<br>
> > - AC_MSG_CHECKING([for occurence(s) of link_all_deplibs = no in $libtool_m4])<br>
> > - libtool_flag_pattern_count=$(grep -c "$libtool_flag_pattern\s*=\s*no" $libtool_m4)<br>
> > - AS_IF([test $libtool_flag_pattern_count -ne 0],<br>
> > - [<br>
> > - AC_MSG_RESULT([$libtool_flag_pattern_count])<br>
> > - AC_MSG_WARN([the detected libtool will not link all dependencies, forcing link_all_deplibs = unknown])<br>
> > - sed -i "s/\($libtool_flag_pattern\)\s*=\s*no/\1=unknown/g" $libtool_m4<br>
> > - ],<br>
> > - [<br>
> > - AC_MSG_RESULT([none])<br>
> > - ])<br>
> > - ])<br>
> > +[<br>
> > + libtool_m4="$srcdir/config/libtool.m4"<br>
> > + libtool_flag_pattern=".*link_all_deplibs\s*,\s*\$1\s*)"<br>
> > + AC_MSG_CHECKING([for occurence(s) of link_all_deplibs = no in $libtool_m4])<br>
> > + libtool_flag_pattern_count=$(grep -c "$libtool_flag_pattern\s*=\s*no" $libtool_m4)<br>
> > + AS_IF([test $libtool_flag_pattern_count -ne 0],<br>
> > + [<br>
> > + AC_MSG_RESULT([$libtool_flag_pattern_count])<br>
> > + AC_MSG_WARN([the detected libtool will not link all dependencies, forcing link_all_deplibs = unknown])<br>
> > + sed -i "s/\($libtool_flag_pattern\)\s*=\s*no/\1=unknown/g" $libtool_m4<br>
> > + ],<br>
> > + [<br>
> > + AC_MSG_RESULT([none])<br>
> > + ])<br>
> > +])<br>
> ><br>
> > AM_CONDITIONAL([NO_SHARED], [test x$enable_shared = xno])<br>
> ><br>
> > @@ -57,55 +62,55 @@ AC_CHECK_HEADERS([ \<br>
> ><br>
> > # Babeltrace viewer check<br>
> > AC_ARG_WITH([babeltrace-bin],<br>
> > - AS_HELP_STRING([--with-babeltrace-bin],<br>
> > - [Location of the babeltrace viewer executable (including the filename)]),<br>
> > + AS_HELP_STRING([--with-babeltrace-bin], [Location of the babeltrace viewer executable (including the filename)]),<br>
> > [BABELTRACE_BIN="$withval"],<br>
> > [BABELTRACE_BIN=''])<br>
> > AC_SUBST([BABELTRACE_BIN])<br>
> ><br>
> > # lttv-gui<br>
> > AC_ARG_WITH([lttv-gui-bin],<br>
> > - AS_HELP_STRING([--with-lttv-gui-bin],<br>
> > - [Location of the lttv GUI viewer executable (including the filename)]),<br>
> > - [LTTV_GUI_BIN="$withval"],<br>
> > - [LTTV_GUI_BIN=''])<br>
> > + AS_HELP_STRING([--with-lttv-gui-bin], [Location of the lttv GUI viewer executable (including the filename)]),<br>
> > + [LTTV_GUI_BIN="$withval"],<br>
> > + [LTTV_GUI_BIN=''])<br>
> > AC_SUBST([LTTV_GUI_BIN])<br>
> ><br>
> > AC_ARG_WITH([consumerd32-bin],<br>
> > - AS_HELP_STRING([--with-consumerd32-bin],<br>
> > - [Location of the 32-bit consumerd executable (including the filename)]),<br>
> > + AS_HELP_STRING([--with-consumerd32-bin], [Location of the 32-bit consumerd executable (including the filename)]),<br>
> > [CONSUMERD32_BIN="$withval"],<br>
> > [CONSUMERD32_BIN=''])<br>
> > AC_SUBST([CONSUMERD32_BIN])<br>
> ><br>
> > AC_ARG_WITH([consumerd64-bin],<br>
> > - AS_HELP_STRING([--with-consumerd64-bin],<br>
> > - [Location of the 64-bit consumerd executable (including the filename)]),<br>
> > + AS_HELP_STRING([--with-consumerd64-bin], [Location of the 64-bit consumerd executable (including the filename)]),<br>
> > [CONSUMERD64_BIN="$withval"],<br>
> > [CONSUMERD64_BIN=''])<br>
> > AC_SUBST([CONSUMERD64_BIN])<br>
> ><br>
> > AC_ARG_WITH([consumerd32-libdir],<br>
> > - AS_HELP_STRING([--with-consumerd32-libdir],<br>
> > - [Directory containing the 32-bit consumerd libraries]),<br>
> > + AS_HELP_STRING([--with-consumerd32-libdir], [Directory containing the 32-bit consumerd libraries]),<br>
> > [CONSUMERD32_LIBDIR="$withval"],<br>
> > [CONSUMERD32_LIBDIR=''])<br>
> > AC_SUBST([CONSUMERD32_LIBDIR])<br>
> ><br>
> > AC_ARG_WITH([consumerd64-libdir],<br>
> > - AS_HELP_STRING([--with-consumerd64-libdir],<br>
> > - [Directory containing the 64-bit consumerd libraries]),<br>
> > + AS_HELP_STRING([--with-consumerd64-libdir], [Directory containing the 64-bit consumerd libraries]),<br>
> > [CONSUMERD64_LIBDIR="$withval"],<br>
> > [CONSUMERD64_LIBDIR=''])<br>
> > AC_SUBST([CONSUMERD64_LIBDIR])<br>
> ><br>
> > AC_ARG_WITH([sessiond-bin],<br>
> > - AS_HELP_STRING([--with-sessiond-bin],<br>
> > - [Location of the sessiond executable (including the filename)]),<br>
> > + AS_HELP_STRING([--with-sessiond-bin], [Location of the sessiond executable (including the filename)]),<br>
> > [SESSIOND_BIN="$withval"],<br>
> > [SESSIOND_BIN=''])<br>
> > AC_SUBST([SESSIOND_BIN])<br>
> ><br>
> > +# Option to only build the consumer daemon and its libraries<br>
> > +AC_ARG_WITH([consumerd-only],<br>
> > + AS_HELP_STRING([--with-consumerd-only], [Only build the consumer daemon [default=no]]),<br>
> > + [consumerd_only=$withval],<br>
> > + [consumerd_only=no])<br>
> > +AM_CONDITIONAL([BUILD_CONSUMERD_ONLY], [test "x$consumerd_only" = "xyes"])<br>
> > +<br>
> > AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_BIN], "$CONSUMERD32_BIN", [Location of the 32-bit consumerd executable.])<br>
> > AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_BIN], "$CONSUMERD64_BIN", [Location of the 64-bit consumerd executable])<br>
> > AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_LIBDIR], "$CONSUMERD32_LIBDIR", [Search for consumerd 32-bit libraries in this location.])<br>
> > @@ -117,23 +122,24 @@ AC_DEFINE_UNQUOTED([CONFIG_SESSIOND_BIN], "$SESSIOND_BIN", [Location of the sess<br>
> > # Check for pthread<br>
> > AC_CHECK_LIB([pthread], [pthread_create], [],<br>
> > [<br>
> > - # Check for pthread in a bionic libc...<br>
> > + # Check for pthread in a bionic libc...<br>
> > AC_CHECK_LIB([c], [pthread_create], [],<br>
> > [<br>
> > - AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])<br>
> > + AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])<br>
> > ])<br>
> > -]<br>
> > -)<br>
> > +])<br>
> ><br>
> > # Check low-level endian compat functions<br>
> > AC_CHECK_DECL(be64toh, [],<br>
> > [<br>
> > - AC_CHECK_DECL(betoh64, [AC_DEFINE_UNQUOTED([LTTNG_HAVE_BETOH64], 1, [Has BSD-style endian conversion operations.])],<br>
> > + AC_CHECK_DECL(betoh64,<br>
> > + [<br>
> > + AC_DEFINE_UNQUOTED([LTTNG_HAVE_BETOH64], 1, [Has BSD-style endian conversion operations.])<br>
> > + ],<br>
> > [<br>
> > AC_MSG_ERROR([Cannot find be64toh, betoh64 or any similar functions.])<br>
> > ])<br>
> > -]<br>
> > -)<br>
> > +])<br>
> ><br>
> > # Check if gettid() is already defined<br>
> > AC_CHECK_DECL(gettid,<br>
> > @@ -146,11 +152,10 @@ AC_CHECK_LIB([popt], [poptGetContext], [],<br>
> > [<br>
> > # Check for libpopt in oprofile for Android<br>
> > AC_CHECK_LIB([oprofile_popt], [poptGetContext], [],<br>
> > - [<br>
> > - AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])<br>
> > - ])<br>
> > -]<br>
> > -)<br>
> > + [<br>
> > + AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])<br>
> > + ])<br>
> > +])<br>
> ><br>
> > # Check for libuuid<br>
> > AC_CHECK_LIB([uuid], [uuid_generate],<br>
> > @@ -176,8 +181,7 @@ AC_CHECK_LIB([uuid], [uuid_generate],<br>
> > AC_MSG_ERROR([Cannot find libuuid uuid_generate, libc uuid_create nor libext2_uuid uuid_generate. Use [LDFLAGS]=-Ldir to specify their location.])<br>
> > ])<br>
> > ])<br>
> > -]<br>
> > -)<br>
> > +])<br>
> > AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])<br>
> > AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"])<br>
> > AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBEXT2_UUID], [test "x$have_libext2_uuid" = "xyes"])<br>
> > @@ -222,41 +226,59 @@ liburcu_version=">= 0.7.2"<br>
> ><br>
> > # Check liburcu needed function calls<br>
> > AC_CHECK_DECL([cds_list_add], [],<br>
> > - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]<br>
> > -)<br>
> > +[<br>
> > + AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]<br>
> > +])<br>
> > AC_CHECK_DECL([cds_wfq_init], [],<br>
> > - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]<br>
> > -)<br>
> > +[<br>
> > + AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]<br>
> > +])<br>
> > AC_CHECK_DECL([cds_wfq_dequeue_blocking], [],<br>
> > - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]<br>
> > -)<br>
> > +[<br>
> > + AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]<br>
> > +])<br>
> > AC_CHECK_DECL([futex_async], [],<br>
> > - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]<br>
> > -)<br>
> > +[<br>
> > + AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]<br>
> > +])<br>
> > AC_CHECK_DECL([rcu_thread_offline], [],<br>
> > - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]<br>
> > -)<br>
> > +[<br>
> > + AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]<br>
> > +])<br>
> > AC_CHECK_DECL([rcu_thread_online], [],<br>
> > - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]<br>
> > -)<br>
> > +[<br>
> > + AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]<br>
> > +])<br>
> > AC_CHECK_DECL([caa_likely], [],<br>
> > - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]<br>
> > -)<br>
> > +[<br>
> > + AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]<br>
> > +])<br>
> ><br>
> > # Check liblttng-ust-ctl library<br>
> > AC_ARG_ENABLE(lttng-ust,<br>
> > - AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),<br>
> > - lttng_ust_support=$enableval, lttng_ust_support=yes)<br>
> > +[<br>
> > + AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support])<br>
> > +],<br>
> > +[<br>
> > + lttng_ust_support=$enableval<br>
> > +],<br>
> > +[<br>
> > + lttng_ust_support=yes<br>
> > +])<br>
> ><br>
> > -AS_IF([test "x$lttng_ust_support" = "xyes"], [<br>
> > +AS_IF([test "x$lttng_ust_support" = "xyes"],<br>
> > +[<br>
> > AC_CHECK_LIB([lttng-ust-ctl], [ustctl_set_filter],<br>
> > - [<br>
> > - AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1], [has LTTng-UST control support])<br>
> > - lttng_ust_ctl_found=yes<br>
> > - ],<br>
> > - [AC_MSG_ERROR([Cannot find LTTng-UST 2.1.x. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])],<br>
> > - [-lurcu-common -lurcu-bp -lurcu-cds -lc -lrt]<br>
> > - )<br>
> > + [<br>
> > + AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1], [has LTTng-UST control support])<br>
> > + lttng_ust_ctl_found=yes<br>
> > + ],<br>
> > + [<br>
> > + AC_MSG_ERROR([Cannot find LTTng-UST 2.1.x. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])<br>
> > + ],<br>
> > + [<br>
> > + -lurcu-common -lurcu-bp -lurcu-cds -lc -lrt<br>
> > + ])<br>
> > ])<br>
> > AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])<br>
> > AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])<br>
> > @@ -283,18 +305,15 @@ AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"<br>
> > AC_CHECK_LIB([c], [fmemopen],<br>
> > [<br>
> > AC_DEFINE_UNQUOTED([LTTNG_HAVE_FMEMOPEN], 1, [Has fmemopen support.])<br>
> > -]<br>
> > -)<br>
> > +])<br>
> ><br>
> > # Check for open_memstream<br>
> > AC_CHECK_LIB([c], [open_memstream],<br>
> > [<br>
> > AC_DEFINE_UNQUOTED([LTTNG_HAVE_OPEN_MEMSTREAM], 1, [Has open_memstream support.])<br>
> > -]<br>
> > -)<br>
> > +])<br>
> ><br>
> > AC_ARG_VAR([LTTNG_RUNDIR], [Path to run directory, default to /var/run])<br>
> > -<br>
> > AS_IF([test -n "$LTTNG_RUNDIR"],<br>
> > [<br>
> > lttng_rundir=$LTTNG_RUNDIR<br>
> > @@ -315,54 +334,49 @@ AC_DEFINE_UNQUOTED([DEFAULT_LTTNG_RUNDIR], ["$lttng_rundir"], [Location of the r<br>
> > swig_version=2.0.0<br>
> ><br>
> > AC_ARG_ENABLE([python-bindings],<br>
> > - [AC_HELP_STRING([--enable-python-bindings],<br>
> > - [compile Python bindings])],<br>
> > - [enable_python=yes], [enable_python=no])<br>
> > +[<br>
> > + AS_HELP_STRING([--enable-python-bindings], [compile Python bindings])<br>
> > +],<br>
> > +[<br>
> > + enable_python=yes<br>
> > +],<br>
> > +[<br>
> > + enable_python=no<br>
> > +])<br>
> ><br>
> > AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python:-yes}" = xyes])<br>
> ><br>
> > if test "x${enable_python:-yes}" = xyes; then<br>
> > - AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])<br>
> > - AM_PATH_PYTHON<br>
> > -<br>
> > - AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])<br>
> > - AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])<br>
> > - AS_IF([test -z "$PYTHON_INCLUDE"], [<br>
> > - AS_IF([test -z "$PYTHON_CONFIG"], [<br>
> > - AC_PATH_PROGS([PYTHON_CONFIG],<br>
> > - [python$PYTHON_VERSION-config python-config],<br>
> > - [no],<br>
> > - [`dirname $PYTHON`])<br>
> > - AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON. Do you have python-dev installed?])])<br>
> > - ])<br>
> > - AC_MSG_CHECKING([python include flags])<br>
> > - PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`<br>
> > - AC_MSG_RESULT([$PYTHON_INCLUDE])<br>
> > - ])<br>
> > -<br>
> > + AX_PKG_SWIG($swig_version, [],<br>
> > + [<br>
> > + AC_MSG_ERROR([SWIG $swig_version or newer is needed])<br>
> > + ])<br>
> > + AM_PATH_PYTHON<br>
> > + AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])<br>
> > + AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])<br>
> > + AS_IF([test -z "$PYTHON_INCLUDE"],<br>
> > + [<br>
> > + AS_IF([test -z "$PYTHON_CONFIG"],<br>
> > + [<br>
> > + AC_PATH_PROGS([PYTHON_CONFIG], [python$PYTHON_VERSION-config python-config], [no], [`dirname $PYTHON`])<br>
> > + AS_IF([test "$PYTHON_CONFIG" = no],<br>
> > + [<br>
> > + AC_MSG_ERROR([cannot find python-config for $PYTHON. Do you have python-dev installed?])<br>
> > + ])<br>
> > + ])<br>
> > + AC_MSG_CHECKING([python include flags])<br>
> > + PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`<br>
> > + AC_MSG_RESULT([$PYTHON_INCLUDE])<br>
> > + ])<br>
> > else<br>
> > - AC_MSG_NOTICE([You may configure with --enable-python-bindings ]dnl<br>
> > -[if you want Python bindings.])<br>
> > -<br>
> > + AC_MSG_NOTICE([You may configure with --enable-python-bindings if you want Python bindings.])<br>
> > fi<br>
> ><br>
> > -# Option to only build the consumer daemon and its libraries<br>
> > -AC_ARG_WITH([consumerd-only],<br>
> > - AS_HELP_STRING([--with-consumerd-only],[Only build the consumer daemon [default=no]]),<br>
> > - [consumerd_only=$withval],<br>
> > - [consumerd_only=no])<br>
> > -AM_CONDITIONAL([BUILD_CONSUMERD_ONLY], [test "x$consumerd_only" = "xyes"])<br>
> > -<br>
> > # Epoll check. If not present, the build will fallback on poll() API<br>
> > -AX_HAVE_EPOLL(<br>
> > - [AX_CONFIG_FEATURE_ENABLE(epoll)],<br>
> > - [AX_CONFIG_FEATURE_DISABLE(epoll)]<br>
> > -)<br>
> > -AX_CONFIG_FEATURE(<br>
> > - [epoll], [This platform supports epoll(7)],<br>
> > - [HAVE_EPOLL], [This platform supports epoll(7).],<br>
> > - [enable_epoll="yes"], [enable_epoll="no"]<br>
> > -)<br>
> > +AX_HAVE_EPOLL([AX_CONFIG_FEATURE_ENABLE(epoll)],[AX_CONFIG_FEATURE_DISABLE(epoll)])<br>
> > +AX_CONFIG_FEATURE([epoll], [This platform supports epoll(7)],<br>
> > + [HAVE_EPOLL], [This platform supports epoll(7).],<br>
> > + [enable_epoll="yes"], [enable_epoll="no"])<br>
> > AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])<br>
> ><br>
> > AC_SYS_LARGEFILE<br>
> > @@ -455,37 +469,43 @@ AS_ECHO()<br>
> > # Target architecture we're building for<br>
> > target_arch=$host_cpu<br>
> > [<br>
> > -for f in $CFLAGS; do<br>
> > - if test $f = "-m32"; then<br>
> > + for f in $CFLAGS; do<br>
> > + if test $f = "-m32"; then<br>
> > target_arch="32-bit"<br>
> > - elif test $f = "-m64"; then<br>
> > + elif test $f = "-m64"; then<br>
> > target_arch="64-bit"<br>
> > - fi<br>
> > -done<br>
> > + fi<br>
> > + done<br>
> > ]<br>
> > AS_ECHO_N("Target architecture: ")<br>
> > AS_ECHO($target_arch)<br>
> ><br>
> > # LTTng-UST enabled/disabled<br>
> > AS_ECHO_N("Lttng-UST support: ")<br>
> > -AS_IF([test "x$lttng_ust_support" = "xyes"],[<br>
> > +AS_IF([test "x$lttng_ust_support" = "xyes"],<br>
> > +[<br>
> > AS_ECHO("Enabled")<br>
> > -],[<br>
> > +],<br>
> > +[<br>
> > AS_ECHO("Disabled")<br>
> > ])<br>
> ><br>
> > #Python binding enabled/disabled<br>
> > AS_ECHO_N("Python binding: ")<br>
> > -AS_IF([test "x${enable_python:-yes}" = xyes], [<br>
> > +AS_IF([test "x${enable_python:-yes}" = xyes],<br>
> > +[<br>
> > AS_ECHO("Enabled")<br>
> > -],[<br>
> > +],<br>
> > +[<br>
> > AS_ECHO("Disabled")<br>
> > ])<br>
> ><br>
> > # Do we build only the consumerd, or everything<br>
> > -AS_IF([test "x$consumerd_only" = "xyes"],[<br>
> > +AS_IF([test "x$consumerd_only" = "xyes"],<br>
> > +[<br>
> > AS_ECHO("Only the consumerd daemon will be built.")<br>
> > -],[<br>
> > +],<br>
> > +[<br>
> > AS_ECHO("All binaries will be built.")<br>
> > ])<br>
> ><br>
> > @@ -497,45 +517,52 @@ AS_ECHO_N("Libraries will be installed in: ")<br>
> > AS_ECHO("`eval eval echo $libdir`")<br>
> ><br>
> > # If we build the sessiond, print the paths it will use<br>
> > -AS_IF([test "x$consumerd_only" = "xno"],[<br>
> > +AS_IF([test "x$consumerd_only" = "xno"],<br>
> > +[<br>
> > AS_ECHO()<br>
> > AS_ECHO_N("The lttng command will look for the lttng-sessiond executable at: ")<br>
> > - AS_IF([test "$SESSIOND_BIN" = ""],[<br>
> > + AS_IF([test "$SESSIOND_BIN" = ""],<br>
> > + [<br>
> > AS_ECHO_N("`eval eval echo $bindir`")<br>
> > AS_ECHO("/lttng-sessiond")<br>
> > - ],[<br>
> > + ],<br>
> > + [<br>
> > AS_ECHO("$SESSIOND_BIN")<br>
> > ])<br>
> > -<br>
> > AS_ECHO()<br>
> > AS_ECHO("The sessiond daemon will look in the following directories: ")<br>
> > AS_ECHO_N("32-bit consumerd executable at: ")<br>
> > - AS_IF([test "$CONSUMERD32_BIN" = ""],[<br>
> > + AS_IF([test "$CONSUMERD32_BIN" = ""],<br>
> > + [<br>
> > AS_ECHO_N("`eval eval echo $lttnglibexecdir`")<br>
> > AS_ECHO("/lttng-consumerd")<br>
> > - ],[<br>
> > + ],<br>
> > + [<br>
> > AS_ECHO("$CONSUMERD32_BIN")<br>
> > ])<br>
> > -<br>
> > AS_ECHO_N("32-bit consumer libraries in: ")<br>
> > - AS_IF([test "$CONSUMERD32_LIBDIR" = ""],[<br>
> > + AS_IF([test "$CONSUMERD32_LIBDIR" = ""],<br>
> > + [<br>
> > AS_ECHO("`eval eval echo $libdir`")<br>
> > - ],[<br>
> > + ],<br>
> > + [<br>
> > AS_ECHO("$CONSUMERD32_LIBDIR")<br>
> > ])<br>
> > -<br>
> > AS_ECHO_N("64-bit consumerd executable at: ")<br>
> > - AS_IF([test "$CONSUMERD64_BIN" = ""],[<br>
> > + AS_IF([test "$CONSUMERD64_BIN" = ""],<br>
> > + [<br>
> > AS_ECHO_N("`eval eval echo $lttnglibexecdir`")<br>
> > AS_ECHO("/lttng-consumerd")<br>
> > - ],[<br>
> > + ],<br>
> > + [<br>
> > AS_ECHO("$CONSUMERD64_BIN")<br>
> > ])<br>
> > -<br>
> > AS_ECHO_N("64-bit consumer libraries in: ")<br>
> > - AS_IF([test "$CONSUMERD64_LIBDIR" = ""],[<br>
> > + AS_IF([test "$CONSUMERD64_LIBDIR" = ""],<br>
> > + [<br>
> > AS_ECHO("`eval eval echo $libdir`")<br>
> > - ],[<br>
> > + ],<br>
> > + [<br>
> > AS_ECHO("$CONSUMERD64_LIBDIR")<br>
> > ])<br>
> > ])<br>
><br>
</div></div>> _______________________________________________<br>
> lttng-dev mailing list<br>
> <a href="mailto:lttng-dev@lists.lttng.org">lttng-dev@lists.lttng.org</a><br>
> <a href="http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev" target="_blank">http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev</a><br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
Mathieu Desnoyers<br>
EfficiOS Inc.<br>
<a href="http://www.efficios.com" target="_blank">http://www.efficios.com</a><br>
<br>
_______________________________________________<br>
lttng-dev mailing list<br>
<a href="mailto:lttng-dev@lists.lttng.org">lttng-dev@lists.lttng.org</a><br>
<a href="http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev" target="_blank">http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev</a><br>
</font></span></blockquote></div><br></div>