X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=2f751546339142c8dfc476f607bfaf1c4e9e1857;hb=bca369849d17e3b0b68b9038a354b69e3a6acfc3;hp=8936592a5c73c03c8e6af77ae2615f029e8fe975;hpb=741880ebfc2e0ca9e981097242fa4473cd2409d8;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 8936592..2f75154 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.24.191, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.27.190, 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 @@ -86,29 +86,52 @@ ENSC_KERNEL_HEADERS(kernelincludedir) ENSC_UV_VROOTDIR(vserverdir) ENSC_CHANGELOG([HEAD]) +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], + [enable_internal_headers=yes]) + +AM_CONDITIONAL(ENSC_ENABLE_INTERNAL_HEADERS, [test x"$enable_internal_headers" = xyes]) +AC_MSG_RESULT([$enable_internal_headers]) + + +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,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' 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]);; 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])