X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=bc8c325e9ceb9a49f49da8f9155bd6af225a348e;hb=3a54945e83cfa6d87fa2e2d849e715127d76476a;hp=653d902d5c4c3a60dd58b959f89ac210714f5936;hpb=34fb6da728588e2292361fa29341289165940b14;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 653d902d..bc8c325e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@
 AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([0.0 foreign])
-AC_CONFIG_SRCDIR([ust/ust.c])
+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.
@@ -50,10 +50,22 @@ 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], [
+	AC_CHECK_FILE(["$withval/urcu.h"], [
+		URCU_CFLAGS="-I$withval"
+		URCU_LIBS="-L$withval -lurcu-bp" ],
+		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_ARG_WITH(kcompat, [  --with-kcompat path     Path to userspace kcompat source
 ], [
-        AC_CHECK_FILE("$KCOMPAT_PATH/kcompat.h", [
-                KCOMPAT_CFLAGS="-I$withval"
+        AC_CHECK_FILE("$withval/kcompat.h", [
+                KCOMPAT_CFLAGS="-I$withval $URCU_CFLAGS"
                 KCOMPAT_LIBS=
                 ], AC_MSG_ERROR([Cannot find kcompat.h in kcompat directory]))
 ], [
@@ -63,24 +75,19 @@ AC_ARG_WITH(kcompat, [  --with-kcompat path     Path to userspace kcompat source
 AC_SUBST(KCOMPAT_CFLAGS)
 AC_SUBST(KCOMPAT_LIBS)
 
-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
 	libust/Makefile
-	hello/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
-	ust/Makefile
+	ustctl/Makefile
+	java/Makefile
 ])
 AC_OUTPUT