X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=ceaf3771520674a2fee3f38d38b71f1759d38844;hp=5d286beb0c2103ffef3fb394c58fd54fb03d2a95;hb=c8fea79c745d42ea8143b7020ae11b4fc2da0d8a;hpb=5a2451c97bd93d882a37fdd6e67ba4a82231a710

diff --git a/configure.ac b/configure.ac
index 5d286beb0..ceaf37715 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,8 @@ LIBS="$PTHREAD_LIBS $LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 CC="$PTHREAD_CC"
 
+AX_LIB_SOCKET_NSL
+
 # Compute minor/major/patchlevel version numbers
 major_version=$(echo AC_PACKAGE_VERSION | $SED 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*.*$/\1/')
 minor_version=$(echo AC_PACKAGE_VERSION | $SED 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*.*$/\1/')
@@ -111,7 +113,7 @@ AC_CHECK_FUNCS([ \
 	gethostbyname gethostname getpagesize localtime_r memchr memset \
 	mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \
 	strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul \
-	strtoull dirfd \
+	strtoull dirfd gethostbyname2 getipnodebyname \
 ])
 
 # Babeltrace viewer check
@@ -403,8 +405,6 @@ else
 
 fi
 
-AX_LIB_SOCKET_NSL
-
 # Epoll check. If not present, the build will fallback on poll() API
 AX_HAVE_EPOLL(
 	[AX_CONFIG_FEATURE_ENABLE(epoll)],
@@ -604,6 +604,7 @@ AC_CONFIG_FILES([
 	src/common/Makefile
 	src/common/kernel-ctl/Makefile
 	src/common/kernel-consumer/Makefile
+	src/common/consumer/Makefile
 	src/common/ust-consumer/Makefile
 	src/common/hashtable/Makefile
 	src/common/sessiond-comm/Makefile
@@ -752,13 +753,6 @@ AS_IF([test "x${enable_python_binding:-yes}" = xyes], [
 	AS_ECHO("Disabled")
 ])
 
-# Do we build only the consumerd, or everything
-AS_IF([test "x$consumerd_only" = "xyes"],[
-	AS_ECHO("Only the consumerd daemon will be built.")
-],[
-	AS_ECHO("All binaries will be built.")
-])
-
 # Print the bindir and libdir this `make install' will install into.
 AS_ECHO()
 AS_ECHO_N("Binaries will be installed in:  ")
@@ -767,47 +761,45 @@ AS_ECHO_N("Libraries will be installed in: ")
 AS_ECHO("`eval eval echo $libdir`")
 
 # If we build the sessiond, print the paths it will use
-AS_IF([test "x$consumerd_only" = "xno"],[
-	AS_ECHO()
-	AS_ECHO_N("The lttng command will look for the lttng-sessiond executable at: ")
-	AS_IF([test "$SESSIOND_BIN" = ""],[
-		AS_ECHO_N("`eval eval echo $bindir`")
-		AS_ECHO("/lttng-sessiond")
-	],[
-		AS_ECHO("$SESSIOND_BIN")
-	])
+AS_ECHO()
+AS_ECHO_N("The lttng command will search for the lttng-sessiond executable at: ")
+AS_IF([test "$SESSIOND_BIN" = ""],[
+	AS_ECHO_N("`eval eval echo $bindir`")
+	AS_ECHO("/lttng-sessiond")
+],[
+	AS_ECHO("$SESSIOND_BIN")
+])
 
-	AS_ECHO()
-	AS_ECHO("The sessiond daemon will look in the following directories: ")
-	AS_ECHO_N("32-bit consumerd executable at: ")
-	AS_IF([test "$CONSUMERD32_BIN" = ""],[
-		AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
-		AS_ECHO("/lttng-consumerd")
-	],[
-		AS_ECHO("$CONSUMERD32_BIN")
-	])
+AS_ECHO()
+AS_ECHO("The sessiond daemon will search the following directories: ")
+AS_ECHO_N("32-bit consumerd executable: ")
+AS_IF([test "$CONSUMERD32_BIN" = ""],[
+	AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
+	AS_ECHO("/lttng-consumerd")
+],[
+	AS_ECHO("$CONSUMERD32_BIN")
+])
 
-	AS_ECHO_N("32-bit consumer libraries in:   ")
-	AS_IF([test "$CONSUMERD32_LIBDIR" = ""],[
-		AS_ECHO("`eval eval echo $libdir`")
-	],[
-		AS_ECHO("$CONSUMERD32_LIBDIR")
-	])
+AS_ECHO_N("32-bit consumer libraries:   ")
+AS_IF([test "$CONSUMERD32_LIBDIR" = ""],[
+	AS_ECHO("`eval eval echo $libdir`")
+],[
+	AS_ECHO("$CONSUMERD32_LIBDIR")
+])
 
-	AS_ECHO_N("64-bit consumerd executable at: ")
-	AS_IF([test "$CONSUMERD64_BIN" = ""],[
-		AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
-		AS_ECHO("/lttng-consumerd")
-	],[
-		AS_ECHO("$CONSUMERD64_BIN")
-	])
+AS_ECHO_N("64-bit consumerd executable: ")
+AS_IF([test "$CONSUMERD64_BIN" = ""],[
+	AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
+	AS_ECHO("/lttng-consumerd")
+],[
+	AS_ECHO("$CONSUMERD64_BIN")
+])
 
-	AS_ECHO_N("64-bit consumer libraries in:   ")
-	AS_IF([test "$CONSUMERD64_LIBDIR" = ""],[
-		AS_ECHO("`eval eval echo $libdir`")
-	],[
-		AS_ECHO("$CONSUMERD64_LIBDIR")
-	])
+AS_ECHO_N("64-bit consumer libraries:   ")
+AS_IF([test "$CONSUMERD64_LIBDIR" = ""],[
+	AS_ECHO("`eval eval echo $libdir`")
+],[
+	AS_ECHO("$CONSUMERD64_LIBDIR")
 ])
 
 AS_ECHO()