X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=21e00b5855651423b4035bcce64af70cfc53d86e;hb=69ba01560f9193dbf4ad2fc8361efb725704807c;hp=6da50cc29a59725b027c03b646a1c43422d9457c;hpb=d9ebd4fc80d40e5f089f0b56426d858b13950513;p=ust.git

diff --git a/configure.ac b/configure.ac
index 6da50cc..21e00b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,10 +3,11 @@
 
 #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_HEADERS([config.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([ust/ust.c])
+AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
 AC_PROG_CC
@@ -49,19 +50,39 @@ 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)
+AC_ARG_WITH(urcu, [  --with-urcu path        Path to userspace RCU source], [
+	AC_CHECK_FILE(["$withval/urcu.h"], [
+		URCU_CFLAGS="-I$withval"
+		URCU_LIBS="-L$withval -lurcu" ],
+		AC_MSG_ERROR([Cannot find urcu.h in urcu directory]))
+], [
+	PKG_CHECK_MODULES(URCU, [liburcu], , [
+		AC_MSG_ERROR([Must specify urcu path.])])
+])
+AC_SUBST(URCU_CFLAGS)
+AC_SUBST(URCU_LIBS)
 
-#AC_CONFIG_FILES([Makefile
-#                 hello/Makefile
-#                 libmallocwrap/Makefile
-#                 libmarkers/Makefile
-#                 libtracectl/Makefile
-#                 libtracing/Makefile
-#                 ust/Makefile
-#                 ustd/Makefile])
+AC_ARG_WITH(kcompat, [  --with-kcompat path     Path to userspace kcompat source
+], [
+        AC_CHECK_FILE("$withval/kcompat.h", [
+                KCOMPAT_CFLAGS="-I$withval $URCU_CFLAGS"
+                KCOMPAT_LIBS=
+                ], AC_MSG_ERROR([Cannot find kcompat.h in kcompat directory]))
+], [
+        PKG_CHECK_MODULES(KCOMPAT, [libkcompat], , [
+		AC_MSG_ERROR([Must specify kcompat path.])])
+])
+AC_SUBST(KCOMPAT_CFLAGS)
+AC_SUBST(KCOMPAT_LIBS)
 
-AC_CONFIG_FILES([Makefile libmarkers/Makefile])
+AC_CONFIG_FILES([
+	Makefile
+	libust/Makefile
+	tests/Makefile
+	tests/hello/Makefile
+	tests/hello2/Makefile
+	libmallocwrap/Makefile
+	ustd/Makefile
+	ust/Makefile
+])
 AC_OUTPUT