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.23.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])
AM_INIT_AUTOMAKE([gnits dist-bzip2 subdir-objects])
AM_MAINTAINER_MODE
-AC_SUBST(CVS2CL_TAG, [])
-
# Checks for programs.
AC_PROG_CXX
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_PROG_RANLIB
+dnl AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AM_PROG_CC_C_O
+ENSC_CXXCOMPILER
check_paths=$PATH:/sbin:/usr/sbin:/usr/local/sbin
AC_PATH_PROGS(AWK, [awk], [awk], [ $check_paths ])
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_CHECK_PROGS(CVS2CL, [cvs2cl])
-AM_CONDITIONAL(HAVE_CVS2CL, [test x"$CVS2CL" != x])
-
-AC_CHECK_PROGS(RCS2LOG, [rcs2log])
-AM_CONDITIONAL(HAVE_RCS2LOG, [test x"$RCS2LOG" != x])
ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
+ENSC_CHECK_CXX_FLAG([-ansi -Wall -pedantic -W -fmessage-length=0])
+
+ENSC_FPIC_SYSCALL
+
AC_MSG_CHECKING([whether to enable debug-code in library])
AC_ARG_ENABLE([lib-debug],
AC_MSG_RESULT(yes)
fi
-AC_MSG_CHECKING([whether to enable dietlibc])
-AC_ARG_ENABLE([dietlibc],
- [AC_HELP_STRING([--disable-dietlibc],
- [do not use dietlibc (default: use dietlibc)])],
- [case "$withval" in
- yes) use_dietlibc=forced;;
- no) use_dietlibc=forced_no;;
- *) AC_MSG_ERROR(['$withval' is not a valid value for --enable-dietlibc]);;
+AC_ARG_VAR(CC, [The C compiler])
+
+ENSC_INITRDDIR(initrddir)
+ENSC_RELEASE(RELEASE_CPPFLAGS)
+ENSC_ENABLE_DIETLIBC(USE_DIETLIBC)
+ENSC_KERNEL_HEADERS(kernelincludedir)
+ENSC_UV_VROOTDIR(vserverdir)
+ENSC_CHANGELOG([trunk])
+
+dnl Check whether to use external kernel headers
+AC_MSG_CHECKING([whether to use internal kernel headers])
+AC_ARG_ENABLE([internal-headers],
+ [AC_HELP_STRING([--disable-internal-headers],
+ [use vserver specific headers from the kernel instead of the shipped versions (default: no)])],
+ [case "$enableval" in
+ yes|no) ;;
+ *) AC_MSG_ERROR(['$i' is not a supported value for '--disable-internal-headers']);;
esac],
- [: ${DIET:=diet}
- which "$DIET" >/dev/null 2>/dev/null && use_dietlibc=detected || use_dietlibc=detected_no])
-
-case x"$use_dietlibc" in
- xdetected)
- AM_CONDITIONAL(USE_DIETLIBC, true)
- AC_MSG_RESULT([yes (autodetected)])
- ;;
- xforced)
- AM_CONDITIONAL(USE_DIETLIBC, true)
- AC_MSG_RESULT([yes (forced)])
- ;;
- xdetected_no)
- AM_CONDITIONAL(USE_DIETLIBC, false)
- AC_MSG_RESULT([no (detected)])
- ;;
- xforced_no)
- AM_CONDITIONAL(USE_DIETLIBC, false)
- AC_MSG_RESULT([no (forced)])
- ;;
- *)
- AC_MSG_ERROR([internal error, use_dietlibc was "$use_dietlibc"])
- ;;
-esac
+ [enable_internal_headers=yes])
+
+AM_CONDITIONAL(ENSC_ENABLE_INTERNAL_HEADERS, [test x"$enable_internal_headers" = xyes])
+AC_MSG_RESULT([$enable_internal_headers])
-AC_ARG_VAR(CC, [The C compiler])
-AC_MSG_CHECKING([for linux kernel headers])
-AC_ARG_WITH([kerneldir],
- [AC_HELP_STRING([--with-kerneldir=DIR],
- [assume top-kernelsources in DIR (default: /lib/modules/<current>/build)])],
- [case "$withval" in
- yes|no) AC_MSG_ERROR(['$withval' is not a valid value for kerneldir]);;
- *) kerneldir=$withval;;
- esac],
- [kerneldir=
- for i in /lib/modules/$(uname -r)/build /usr/src/linux /usr; do
- test -e $i/include/linux/version.h && { kerneldir=$i; break; }
- done])
-
-test "$kerneldir" -a -e $i/include/linux/version.h || {
- AC_MSG_ERROR([Can not find kernelsources])
-}
-
-kernelincludedir=$kerneldir/include
-AC_SUBST(kernelincludedir)
-AC_MSG_RESULT($kernelincludedir/linux)
+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,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'
+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]);;
- *) 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])