From ed452f03c192ad7b6ffbaf6848a123c258efedd8 Mon Sep 17 00:00:00 2001 From: Jan Blunck Date: Wed, 10 Jun 2009 20:07:18 +0200 Subject: [PATCH 1/1] New kcompat headers depend on urcu's arch.h and arch_atomic.h Signed-off-by: Jan Blunck --- configure.ac | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 7e0ea07c..006a9035 100644 --- a/configure.ac +++ b/configure.ac @@ -50,19 +50,6 @@ 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("$withval/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_CHECK_FILE(["$withval/urcu.h"], [ URCU_CFLAGS="-I$withval" @@ -75,6 +62,19 @@ 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 -- 2.34.1