Merged, thanks! Jérémie
On Thu, Oct 15, 2015 at 4:38 PM, Michael Jeanson <[email protected]> wrote: > On platforms that require extra libraries to link socket apps, > running this macro before the function checks will lead to > socket functions being correctly detected. > > Signed-off-by: Michael Jeanson <[email protected]> > --- > configure.ac | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 31bc76a..55a357b 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -81,9 +81,11 @@ if test ! -f "$srcdir/formats/ctf/metadata/ctf-lexer.c"; > then > ]) > fi > > - > AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile > BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule) > > +# Check what libraries are required on this platform to link sockets > programs. > +AX_LIB_SOCKET_NSL > + > # Checks for typedefs, structures, and compiler characteristics. > AC_C_INLINE > AC_TYPE_PID_T > @@ -145,9 +147,6 @@ esac > > AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"]) > > -# Check what libraries are required on this platform to link sockets > programs. > -AX_LIB_SOCKET_NSL > - > # Check for libuuid > AC_CHECK_LIB([uuid], [uuid_generate], > [ > -- > 1.9.1 > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
