X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=271bbb2c3489c1700865c6c049d6bb417f1175a4;hb=9441df61728a22747f28a713b6c00b1732acbd57;hp=070093bbcea7e6f919f1be949e59bb200a06b998;hpb=8624c5493f7a6a9dd7bc4d32eb2731a16b78d6e5;p=ust.git

diff --git a/configure.ac b/configure.ac
index 070093b..271bbb2 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 target system])
+case $target_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
@@ -76,6 +94,5 @@ AC_CONFIG_FILES([
 	libinterfork/Makefile
 	ustd/Makefile
 	ustctl/Makefile
-	java/Makefile
 ])
 AC_OUTPUT