dnl $Id$
-dnl Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+dnl Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
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
dnl
AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.26.192, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.27.197, enrico.scholz@informatik.tu-chemnitz.de)
AC_CONFIG_SRCDIR([src/capchroot.c])
AC_CONFIG_HEADER([config.h])
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_PROG_RANLIB
-dnl AC_PROG_LIBTOOL
+dnl AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AM_PROG_CC_C_O
ENSC_CXXCOMPILER
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 ])
ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
ENSC_ENABLE_DIETLIBC(USE_DIETLIBC)
ENSC_KERNEL_HEADERS(kernelincludedir)
ENSC_UV_VROOTDIR(vserverdir)
-ENSC_CHANGELOG([HEAD])
+ENSC_CHANGELOG([trunk])
dnl Check whether to use external kernel headers
AC_MSG_CHECKING([whether to use internal kernel headers])
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)])],
[],
- [supported_apis=ALL])
+ [enable_apis=ALL])
-test x"$supported_apis" != xALL || supported_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 $supported_apis; do
+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
-AC_MSG_RESULT([$supported_apis])
+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
-AC_CHECK_FUNCS([sys_virtual_context])
+AC_CHECK_FUNCS([vserver])
AC_CHECK_DECLS(MS_MOVE,,,[#include <linux/fs.h>])
-AC_CHECK_TYPES(ctx_t,,,[#include <sys/types.h>])
+AC_CHECK_TYPES(xid_t,,,[#include <sys/types.h>])
dnl BIG HACK! Do some autodetection here!
AC_DEFINE(UTMP_GID, [22], [The utmp gid-number])