X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=68f41315c9bee4ed00aa60c4f37a89a73f9c0779;hb=9b3a9a1f8ee47787e50a130b444dae38eee5dca0;hp=ca1de8746c9c77ca7ebfbd96e8ac248fd4310a09;hpb=126bf5f49f3daea4c7c11570e56569bc6fd6d35b;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index ca1de874..68f41315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,30 @@ AC_CHECK_HEADERS([ \
 	wchar.h \
 ])
 
+# Set architecture specific options
+AS_CASE([$host_cpu],
+	[i[[3456]]86], [],
+	[x86_64], [],
+	[amd64], [],
+	[powerpc], [],
+	[ppc64], [],
+	[ppc64le], [],
+	[powerpc64], [],
+	[powerpc64le], [],
+	[s390], [NO_UNALIGNED_ACCESS=1],
+	[s390x], [NO_UNALIGNED_ACCESS=1],
+	[arm*], [
+		NO_UNALIGNED_ACCESS=1
+		NO_NUMA=1
+		],
+	[aarch64*], [NO_UNALIGNED_ACCESS=1],
+	[mips*], [NO_UNALIGNED_ACCESS=1],
+	[tile*], [NO_UNALIGNED_ACCESS=1],
+	[
+		UNSUPPORTED_ARCH=1
+		NO_UNALIGNED_ACCESS=1
+	])
+
 # Configuration options, which will be installed in the config.h
 AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
 AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h])
@@ -248,6 +272,10 @@ AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find lib
 AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
 
 # numa.h integration
+AS_IF([test "x$NO_NUMA" = "x1"],[
+      AS_IF([test "x$enable_numa" = "x" ], [enable_numa=no])
+])
+
 AC_ARG_ENABLE([numa], [
 AS_HELP_STRING([--disable-numa], [disable NUMA support])
 ], [
@@ -275,28 +303,6 @@ AS_IF([test "x$have_perf_event" = "xyes"], [
 	AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1])
 ])
 
-AC_MSG_CHECKING([host system alignment requirements])
-AS_CASE([$host_cpu],
-	[i[[3456]]86], [],
-	[x86_64], [],
-	[amd64], [],
-	[powerpc], [],
-	[ppc64], [],
-	[ppc64le], [],
-	[powerpc64], [],
-	[powerpc64le], [],
-	[s390], [NO_UNALIGNED_ACCESS=1],
-	[s390x], [NO_UNALIGNED_ACCESS=1],
-	[arm*], [NO_UNALIGNED_ACCESS=1],
-	[aarch64*], [NO_UNALIGNED_ACCESS=1],
-	[mips*], [NO_UNALIGNED_ACCESS=1],
-	[tile*], [NO_UNALIGNED_ACCESS=1],
-	[
-		UNSUPPORTED_ARCH=1
-		NO_UNALIGNED_ACCESS=1
-	])
-AC_MSG_RESULT([$host_cpu])
-
 AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [
 	AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
 ])
@@ -417,6 +423,19 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
 AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"])
 AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"])
 
+# Enable building examples
+AC_ARG_ENABLE(
+	examples,
+	AS_HELP_STRING(
+		[--disable-examples],
+		[Do not build and install examples]
+	),
+	[enable_examples=$enableval],
+	[enable_examples=yes]
+)
+
+AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" != "xno"])
+
 # Set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file
 # is not distributed in tarballs.
 AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no])
@@ -590,6 +609,9 @@ PPRINT_PROP_BOOL([NUMA], $value)
 AS_ECHO
 PPRINT_SET_INDENT(0)
 
+test "x$enable_examples" = xyes && value=1 || value=0
+PPRINT_PROP_BOOL([Build and install examples], $value, $PPRINT_COLOR_SUBTITLE)
+
 # man pages build enabled/disabled
 m4_pushdef([build_man_pages_msg], [Build and install man pages])