X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=b0320b02453dc62eb4a89998ff8784d778aa6dc3;hb=43f0d5acc1fc89b5890365f7624a2dd8e946df1f;hp=dbaa45b7b2f88d2843bb480879186388860e20a2;hpb=5faab98d64234adfe053433a52024cb487843fa0;p=ust.git

diff --git a/configure.ac b/configure.ac
index dbaa45b..b0320b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,12 @@
 
 #AC_PREREQ([2.63])
 AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca])
-AC_CONFIG_AUX_DIR(make_scripts)
-AM_INIT_AUTOMAKE([0.0 foreign])
-AC_CONFIG_SRCDIR([ust/localerr.h])
+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])
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
@@ -49,21 +52,48 @@ AC_C_INLINE
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
 
-AC_ARG_WITH(urcu, [  --with-urcu path	Path to userspace RCU source], URCU_PATH="$withval", AC_MSG_ERROR([Must specify urcu path.]))
-AC_CHECK_FILE("$URCU_PATH/urcu.h", , AC_MSG_ERROR([Cannot find urcu.h in urcu directory]))
-AC_ARG_WITH(kcompat, [  --with-kcompat path	Path to userspace kcompat source], KCOMPAT_PATH="$withval", AC_MSG_ERROR([Must specify kcompat path.]))
-AC_CHECK_FILE("$KCOMPAT_PATH/kcompat.h", , AC_MSG_ERROR([Cannot find kcompat.h in kcompat directory]))
-AC_SUBST(URCU_PATH)
-AC_SUBST(KCOMPAT_PATH)
+# URCU
 
-#AC_CONFIG_FILES([Makefile
-#                 hello/Makefile
-#                 libmallocwrap/Makefile
-#                 libmarkers/Makefile
-#                 libtracectl/Makefile
-#                 libtracing/Makefile
-#                 ust/Makefile
-#                 ustd/Makefile])
+# urcu - check if we just find the headers it out of the box.
+AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CFLAGS]=-Idir to specify their location.])])
 
-AC_CONFIG_FILES([Makefile libust/Makefile hello/Makefile libmallocwrap/Makefile ustd/Makefile ust/Makefile])
+# urcu - check that URCU lib is available to compilation
+AC_CHECK_LIB([urcu-bp], [synchronize_rcu], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
+
+# kcompat
+
+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
+	tests/hello2/Makefile
+	tests/basic/Makefile
+	tests/basic_long/Makefile
+	tests/fork/Makefile
+	tests/simple_include/Makefile
+	libmallocwrap/Makefile
+	libinterfork/Makefile
+	ustd/Makefile
+	ustctl/Makefile
+])
 AC_OUTPUT