X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=a7f9a7398c7d18eb27d6d0dcb89c46f265b0b78b;hb=70551b5ea9201e5640a37f01d5b12bce1516dbb4;hp=454faac118a4a9e274c8d5069e457681525300d9;hpb=e0baa9906b1c443228605a2b29c37b4bc004c61c;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 454faac1..a7f9a739 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(make_scripts)
 AM_INIT_AUTOMAKE([0.0 foreign])
 AC_CONFIG_SRCDIR([ust/localerr.h])
-#AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
 AC_PROG_CC
@@ -49,8 +49,10 @@ 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_ARG_WITH(urcu, [  --with-urcu=path	Path to userspace RCU library source], URCU_PATH="$withval", AC_MSG_ERROR([Must specify liburcu path.]))
+AC_CHECK_FILE("$URCU_PATH/urcu.h", , AC_MSG_ERROR([Cannot find urcu.h in liburcu directory]))
+AC_ARG_WITH(kcompat, [  --with-kcompat=path	Path to libkcompat source], KCOMPAT_PATH="$withval", AC_MSG_ERROR([Must specify libkcompat path.]))
+AC_CHECK_FILE("$KCOMPAT_PATH/kcompat.h", , AC_MSG_ERROR([Cannot find kcompat.h in libkcompat directory]))
 AC_SUBST(URCU_PATH)
 AC_SUBST(KCOMPAT_PATH)
 
@@ -63,5 +65,5 @@ AC_SUBST(KCOMPAT_PATH)
 #                 ust/Makefile
 #                 ustd/Makefile])
 
-AC_CONFIG_FILES([Makefile libmarkers/Makefile libtracectl/Makefile libtracing/Makefile hello/Makefile libmallocwrap/Makefile])
+AC_CONFIG_FILES([Makefile libust/Makefile hello/Makefile libmallocwrap/Makefile ustd/Makefile ust/Makefile])
 AC_OUTPUT