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
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_SUBST(URCU_PATH)
+KCOMPAT_PATH=
+AC_ARG_WITH(kcompat, [ --with-kcompat path Path to userspace kcompat source], [
+ AC_CHECK_FILE(["$withval/kcompat.h"], KCOMPAT_PATH="$withval", [
+ AC_MSG_ERROR([Cannot find kcompat.h in kcompat directory])
+ ])
+])
+if test -n "${KCOMPAT_PATH}" ; then
+ CPPFLAGS="-I$KCOMPAT_PATH/ $CPPFLAGS"
+ AC_SUBST(CPPFLAGS)
+fi
+AC_CHECK_HEADER([kcompat.h], , AC_MSG_ERROR([Must specify kcompat path.]))
AC_SUBST(KCOMPAT_PATH)
+URCU_LIB=
+AC_CHECK_HEADER([urcu.h], [
+ AC_CHECK_LIB(urcu, synchronize_rcu, [
+ URCU_PATH=
+ URCU_LIB="-lurcu"
+ ])
+])
+AC_ARG_WITH(urcu, [ --with-urcu path Path to userspace RCU source], [
+ AC_CHECK_FILE(["$withval/urcu.h"], [
+ URCU_PATH="$withval"
+ URCU_LIB="/liburcu.la" ],
+ AC_MSG_ERROR([Cannot find urcu.h in urcu directory]))
+])
+if test -z "${URCU_LIB}" ; then
+ AC_MSG_ERROR([Must specify urcu path.])
+fi
+AC_SUBST(URCU_PATH)
+AC_SUBST(URCU_LIB)
+
#AC_CONFIG_FILES([Makefile
# hello/Makefile
# libmallocwrap/Makefile
# ust/Makefile
# ustd/Makefile])
-AC_CONFIG_FILES([Makefile libmarkers/Makefile])
+AC_CONFIG_FILES([Makefile libust/Makefile hello/Makefile libmallocwrap/Makefile ustd/Makefile ust/Makefile])
AC_OUTPUT