X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=b0320b02453dc62eb4a89998ff8784d778aa6dc3;hb=4292ed8a2fd23d186b7d3a5985a3f219948e6796;hp=441caaa28482935e3b6129696dd56f5dfe6209a2;hpb=3537976a4bad90e28471bc7f15287b46cc208fa5;p=ust.git

diff --git a/configure.ac b/configure.ac
index 441caaa..b0320b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,8 @@
 #AC_PREREQ([2.63])
 AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca])
 AC_CONFIG_AUX_DIR([config])
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([0.0 foreign dist-bzip2 no-dist-gzip])
 AC_CONFIG_SRCDIR([ustctl/ustctl.c])
@@ -62,9 +64,25 @@ AC_CHECK_LIB([urcu-bp], [synchronize_rcu], [], [AC_MSG_ERROR([Cannot find liburc
 
 AC_CHECK_HEADERS([kcompat.h], [], [AC_MSG_ERROR([Cannot find kcompat headers (kcompat.h). Use [CFLAGS]=-Idir to specify their location.])])
 
+AC_MSG_CHECKING([library format for the host system])
+case $host_cpu in
+	i386) LIBFORMAT="elf32-i386" ;;
+	i486) LIBFORMAT="elf32-i386" ;;
+	i586) LIBFORMAT="elf32-i386" ;;
+	i686) LIBFORMAT="elf32-i386" ;;
+	x86_64) LIBFORMAT="elf64-x86-64" ;;
+	ppc) LIBFORMAT="elf32-powerpc" ;;
+	ppc64) LIBFORMAT="elf64-powerpc" ;;
+	s390) LIBFORMAT="elf32-s390" ;;
+	s390x) LIBFORMAT="elf64-s390" ;;
+	*) AC_MSG_ERROR([unable to detect library format (unsupported architecture?)]) ;;
+esac
+AC_SUBST(LIBFORMAT)
+AC_MSG_RESULT($LIBFORMAT)
 
 AC_CONFIG_FILES([
 	Makefile
+	include/Makefile
 	libust/Makefile
 	tests/Makefile
 	tests/hello/Makefile
@@ -72,6 +90,7 @@ AC_CONFIG_FILES([
 	tests/basic/Makefile
 	tests/basic_long/Makefile
 	tests/fork/Makefile
+	tests/simple_include/Makefile
 	libmallocwrap/Makefile
 	libinterfork/Makefile
 	ustd/Makefile