X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=7ad09b7955a82ba592402be1834074ec755fdb44;hb=5af67da7670c5c10ebf7a94d934bef949c7c2936;hp=2006ebae3ea651499aab67b67f87f6f1213ffb2e;hpb=ae626cd296f088f1d783361fa9ea8345e5218f43;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 2006eba..7ad09b7 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -1,6 +1,6 @@ dnl $Id$ -dnl Copyright (C) 2003 Enrico Scholz +dnl Copyright (C) 2003,2004 Enrico Scholz dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -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.193, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.27.198, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) @@ -85,7 +85,7 @@ ENSC_RELEASE(RELEASE_CPPFLAGS) ENSC_ENABLE_DIETLIBC(USE_DIETLIBC) ENSC_KERNEL_HEADERS(kernelincludedir) ENSC_UV_VROOTDIR(vserverdir) -ENSC_CHANGELOG([MAIN]) +ENSC_CHANGELOG([trunk]) dnl Check whether to use external kernel headers AC_MSG_CHECKING([whether to use internal kernel headers]) @@ -106,22 +106,32 @@ 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++)