Fix: configure.ac should use "--target", not "--host"

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 79c33ff395896101319c4961e5d975f60c747d7e..f72cb551caedd65598026a44bfe580c639b67fd7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.0.1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.1.0-rc1],[mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -34,8 +34,8 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number])
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
 AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number])
 
-version_name="Annedd'ale"
-version_description="New type of beer, 100% from Quebec, flavored with sapin beaumier needles, with a touch of hops."
+version_name="Basse Messe"
+version_description="Light coloured German ale whose style was named after the city Cologne (Koln) where it was first brewed. It is a rather simple beer with lightly fruity aromas and a delicate hoppy fragrance. The beer has a pronounced malty taste with a subtle bitter aftertaste"
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
 AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description])
 
@@ -64,6 +64,8 @@ AS_IF([test "x$libtool_fixup" = "xyes"],
                  ])
            ])
 
+AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"])
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
@@ -169,11 +171,11 @@ 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.])])
 
 
-# Check for various supplementary host information (beyond the
+# Check for various supplementary target information (beyond the
 # triplet) which might affect the library format choices.  E.g., we
 # can be building with `i686-unknown-linux-gnu-gcc -m64'
 
-case "${host}" in
+case "${target}" in
 changequote(,)dnl
   i[34567]86-*-linux*)
 changequote([,])dnl
@@ -190,8 +192,8 @@ got it
     ;;
 esac
 
-AC_MSG_CHECKING([library format for the host system])
-case $host_cpu in
+AC_MSG_CHECKING([library format for the target system])
+case $target_cpu in
 changequote(,)dnl
        i[3456]86)
 changequote([,])dnl
@@ -211,12 +213,12 @@ changequote([,])dnl
         armv5) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
        arm) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
        mips*) LIBFORMAT=""; NO_UNALIGNED_ACCESS=1;;
-       *) AC_MSG_ERROR([unable to detect library format (unsupported architecture ($host_cpu)?)]) ;;
+       *) AC_MSG_ERROR([unable to detect library format (unsupported architecture ($target_cpu)?)]) ;;
 esac
 AC_SUBST(LIBFORMAT)
 AC_MSG_RESULT($LIBFORMAT)
 
-if test "x$host_cpu" = "xarm" ; then
+if test "x$target_cpu" = "xarm" ; then
 AC_MSG_CHECKING([checking for armv5])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #ifndef __ARM_ARCH_5TEJ__
@@ -330,6 +332,7 @@ AC_CONFIG_FILES([
        tests/hello/Makefile
        tests/hello-static-lib/Makefile
        tests/hello.cxx/Makefile
+       tests/daemon/Makefile
        tests/demo/Makefile
        tests/fork/Makefile
        tests/ust-basic-tracing/Makefile