#AC_PREREQ([2.63])
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_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_HEADERS([config.h])
# Checks for programs.
AC_FUNC_MALLOC
AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
-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)
+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
-# hello/Makefile
-# libmallocwrap/Makefile
-# libmarkers/Makefile
-# libtracectl/Makefile
-# libtracing/Makefile
-# ust/Makefile
-# ustd/Makefile])
+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 libmallocwrap/Makefile ustd/Makefile ust/Makefile])
+AC_CONFIG_FILES([
+ Makefile
+ libust/Makefile
+ tests/Makefile
+ tests/hello/Makefile
+ tests/hello2/Makefile
+ tests/basic/Makefile
+ tests/basic_long/Makefile
+ libmallocwrap/Makefile
+ libinterfork/Makefile
+ ustd/Makefile
+ ust/Makefile
+])
AC_OUTPUT