X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=b6c1987a56a1c9afa79947c96e559eb164a8a890;hb=e29867baf76f8e0f30cb44c4eb9f34dc72227efe;hp=b14943a463077104f1197b6f4b28be984548ef16;hpb=d4ecbf95188f2b5800085e3dbe44dd7c9804e58b;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index b14943a..b6c1987 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -24,7 +24,7 @@ dnl distribution terms that you use for the rest of that program. dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.27.196, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.28.190, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) @@ -51,7 +51,9 @@ AC_PATH_PROGS(NICE, [nice], [nice], [ $check_paths ]) AC_PATH_PROGS(VCONFIG, [vconfig], [vconfig], [ $check_paths ]) AC_PATH_PROGS(WC, [wc], [wc], [ $check_paths ]) AC_PATH_PROGS(PS, [ps], [/bin/ps], [ $check_paths ]) - +AC_PATH_PROGS(XSLTPROC, [xsltproc], [xsltproc]) +AC_PATH_PROGS(SED, [sed], [sed]) +AC_PATH_PROGS(CMP, [cmp], [cmp]) ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W]) ENSC_CHECK_CXX_FLAG([-ansi -Wall -pedantic -W -fmessage-length=0]) @@ -106,30 +108,35 @@ dnl Check for the APIs to be used AC_MSG_CHECKING([for supported APIs]) AC_ARG_ENABLE([apis], [AC_HELP_STRING([--enable-apis=APIS], - [enable support for the given apis; possible values are: legacy,compat,v11,ALL (default: ALL)])], + [enable support for the given apis; possible values are: legacy,compat,v11,v13,fscompat,ALL (default: ALL)])], [], [enable_apis=ALL]) -test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11' +test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,v13,fscompat' +enable_api_oldproc= old_IFS=$IFS IFS=,; for i in $enable_apis; do case "$i" in - compat) AC_DEFINE(VC_ENABLE_API_COMPAT, 1, [Enable support for compatibily syscall API]);; - legacy) AC_DEFINE(VC_ENABLE_API_LEGACY, 1, [Enable support for old, /proc parsing API]);; - v11) AC_DEFINE(VC_ENABLE_API_V11, 1, [Enable support for API of vserver 1.1.x]);; - *) AC_MSG_ERROR(['$i' is not a supported API]);; + compat) AC_DEFINE(VC_ENABLE_API_COMPAT, 1, [Enable support for compatibility syscall API]) + enable_api_oldproc=1;; + legacy) AC_DEFINE(VC_ENABLE_API_LEGACY, 1, [Enable support for old, /proc parsing API]) + enable_api_old_proc=1;; + v11) AC_DEFINE(VC_ENABLE_API_V11, 1, [Enable support for API of vserver 1.1.x]) + enable_api_oldproc=1;; + v13) AC_DEFINE(VC_ENABLE_API_V13, 1, [Enable support for API of vserver 1.3.x]);; + fscompat) AC_DEFINE(VC_ENABLE_API_FSCOMPAT, 1, [Enable support for filesystem compatibility API]);; + *) AC_MSG_ERROR(['$i' is not a supported API]);; esac done IFS=$old_IFS +if test x"$enable_api_oldproc" != x; then + AC_DEFINE(VC_ENABLE_API_OLDPROC, 1, [Enable API for a backward compatible /proc parsing]) + enable_apis="$enable_apis,oldproc" +fi AC_MSG_RESULT([$enable_apis]) -AC_LANG_PUSH(C++) -AC_CHECK_HEADERS([ext2fs/ext2fs.h], [], - [AC_CHECK_HEADERS([linux/ext2_fs.h], [], - [AC_MSG_ERROR([Sorry, do not know, how to include 'ext2fs.h'])])]) -AC_LANG_POP - +ENSC_CHECK_EXT2FS_HEADER AC_CHECK_FUNCS([vserver]) AC_CHECK_DECLS(MS_MOVE,,,[#include ]) AC_CHECK_TYPES(xid_t,,,[#include ])