X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=441caaa28482935e3b6129696dd56f5dfe6209a2;hb=6af64c431c0a521fc927fa72b9f4015397ce11d4;hp=075fe521bff11761c206b291e43e024025601b77;hpb=6cb88bc04f67ebc3264d3832f4ce5cca2c642ab4;p=ust.git

diff --git a/configure.ac b/configure.ac
index 075fe52..441caaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,10 @@
 
 #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_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,19 +50,31 @@ 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_ARG_WITH(kcompat, [  --with-kcompat path	Path to userspace kcompat source], KCOMPAT_PATH="$withval", AC_MSG_ERROR([Must specify kcompat path.]))
-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])
+# 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_CONFIG_FILES([
+	Makefile
+	libust/Makefile
+	tests/Makefile
+	tests/hello/Makefile
+	tests/hello2/Makefile
+	tests/basic/Makefile
+	tests/basic_long/Makefile
+	tests/fork/Makefile
+	libmallocwrap/Makefile
+	libinterfork/Makefile
+	ustd/Makefile
+	ustctl/Makefile
+])
 AC_OUTPUT