X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=21e00b5855651423b4035bcce64af70cfc53d86e;hb=34e4b7db790ca5ff678eae7cf5658455a8991870;hp=6f18d7a597ed0707303d679da1c5062f852239a5;hpb=55355fa5bb062aeb705e808642bf953d9de9b3ba;p=ust.git

diff --git a/configure.ac b/configure.ac
index 6f18d7a..21e00b5 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/localerr.h])
+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.
@@ -50,20 +50,7 @@ AC_C_INLINE
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
 
-AC_ARG_WITH(kcompat, [  --with-kcompat path     Path to userspace kcompat source
-], [
-        AC_CHECK_FILE("$KCOMPAT_PATH/kcompat.h", [
-                KCOMPAT_CFLAGS="-I$withval"
-                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_ARG_WITH(urcu, [  --with-urcu path	Path to userspace RCU source], [
+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" ],
@@ -75,10 +62,25 @@ AC_ARG_WITH(urcu, [  --with-urcu path	Path to userspace RCU source], [
 AC_SUBST(URCU_CFLAGS)
 AC_SUBST(URCU_LIBS)
 
+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
 	libust/Makefile
-	hello/Makefile
+	tests/Makefile
+	tests/hello/Makefile
+	tests/hello2/Makefile
 	libmallocwrap/Makefile
 	ustd/Makefile
 	ust/Makefile