X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=f9282f8844a86d86a9bf8e32ab0da84a204fe8f2;hb=50f3dba07e569f6ef3070e47cc1e5866c3684811;hp=dc32afbdc360096d5e5f9bf285d9d8e69b647522;hpb=81514900a5f314fdd69ccf7e785e31d1afa2c218;p=ust.git

diff --git a/configure.ac b/configure.ac
index dc32afb..f9282f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,9 @@ AC_INIT([ust], [0.4], [pierre-marc dot fournier at polymtl dot ca])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([ustctl/ustctl.c])
 AC_CONFIG_HEADERS([config.h])
 
@@ -94,17 +95,18 @@ changequote([,])dnl
 	  fi
 	  ;;
 	x86_64) LIBFORMAT="elf64-x86-64" ;;
-	ppc) LIBFORMAT="elf32-powerpc" ;;
+	powerpc) 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?)]) ;;
+	*) AC_MSG_ERROR([unable to detect library format (unsupported architecture ($host_cpu)?)]) ;;
 esac
 AC_SUBST(LIBFORMAT)
 AC_MSG_RESULT($LIBFORMAT)
 
 AC_CONFIG_FILES([
 	Makefile
+	doc/Makefile
 	include/Makefile
 	libust/Makefile
 	tests/Makefile
@@ -116,7 +118,7 @@ AC_CONFIG_FILES([
 	tests/simple_include/Makefile
 	tests/snprintf/Makefile
 	tests/test-nevents/Makefile
-	tests/test-libmallocwrap/Makefile
+	tests/test-libustinstr-malloc/Makefile
 	libustinstr-malloc/Makefile
 	libustfork/Makefile
 	ustd/Makefile