X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=106b2e30d898b6e99313cd132fa1f164920c4d63;hb=1c06f3a52e3719e75d2d5919d3bc513d3f432831;hp=eb2814fb21951953bbe60aaf54b4b4104f0a2af2;hpb=64e1b29ac22689e16c21cee78f4f2d148cb83d6a;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index eb2814f..106b2e3 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.26.192, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.27.195, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) @@ -36,8 +36,8 @@ AC_PROG_CXX 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 @@ -50,6 +50,7 @@ AC_PATH_PROGS(UMOUNT, [umount], [/bin/umount], [ $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 ]) ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W]) @@ -84,7 +85,7 @@ ENSC_RELEASE(RELEASE_CPPFLAGS) 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]) @@ -107,12 +108,12 @@ 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)])], [], - [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' 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]);; @@ -121,15 +122,17 @@ for i in $supported_apis; do esac done IFS=$old_IFS -AC_MSG_RESULT([$supported_apis]) +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 ]) -AC_CHECK_TYPES(ctx_t,,,[#include ]) +AC_CHECK_TYPES(xid_t,,,[#include ]) dnl BIG HACK! Do some autodetection here! AC_DEFINE(UTMP_GID, [22], [The utmp gid-number])