add usttrace script

[ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 653d902d5c4c3a60dd58b959f89ac210714f5936..500765b74efc1244ee9c4627702cf9773c935d30 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,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])
+AM_INIT_AUTOMAKE([0.0 foreign dist-bzip2 no-dist-gzip])
 AC_CONFIG_SRCDIR([ust/ust.c])
 AC_CONFIG_HEADERS([config.h])
 
@@ -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,11 +62,29 @@ 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
+       tests/basic/Makefile
+       tests/basic_long/Makefile
        libmallocwrap/Makefile
+       libinterfork/Makefile
        ustd/Makefile
        ust/Makefile
 ])