X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=f72cb551caedd65598026a44bfe580c639b67fd7;hb=98c8a1d90d1052980365353eef201124863128b0;hp=91ad8d935fc869a8ad5709acd231a06940cf9b59;hpb=38936cf4da9aaf752fdc9c2c56e00b9ddcad8530;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 91ad8d93..f72cb551 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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__