X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=bc8c325e9ceb9a49f49da8f9155bd6af225a348e;hb=2a3fba4984dd15c145ba58803c6fa3cf557c34dc;hp=500765b74efc1244ee9c4627702cf9773c935d30;hpb=5f04cdcbbea9d600b3f325dd739b217ab2a8f78a;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 500765b7..bc8c325e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ 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 dist-bzip2 no-dist-gzip])
-AC_CONFIG_SRCDIR([ust/ust.c])
+AC_CONFIG_SRCDIR([ustctl/ustctl.c])
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
@@ -53,7 +53,7 @@ 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" ],
+		URCU_LIBS="-L$withval -lurcu-bp" ],
 		AC_MSG_ERROR([Cannot find urcu.h in urcu directory]))
 ], [
 	PKG_CHECK_MODULES(URCU, [liburcu], , [
@@ -83,9 +83,11 @@ AC_CONFIG_FILES([
 	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