X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=4112f17e3b73041acbfb2f58ed570f4c4e4b37c3;hb=1e74ab169cde61be97ca9ccb2f189fa0bd8849a6;hp=44de286e2c310d5cfda94028ed4fa26a2fbc9e8a;hpb=e1f5cbac553962aa8725347509145147103fbe7c;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 44de286..4112f17 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -25,7 +25,7 @@ dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.23.93, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.27.90, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) @@ -41,53 +41,75 @@ AC_PROG_LN_S AC_PROG_RANLIB AM_PROG_CC_C_O -ENSC_CHECK_CC_FLAG([-std=c99]) +ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W -Wno-unused-parameter]) +ENSC_CHECK_CXX_FLAG([-ansi -Wall -pedantic -W -fmessage-length=0]) 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//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) +ENSC_KERNEL_HEADERS(kernelincludedir) +ENSC_UV_VROOTDIR(vserverdir) +ENSC_CHANGELOG([SYSCALL_SWITCH]) +dnl Check whether to enable linuxconf +AC_MSG_CHECKING([whether to enable linuxconf modules]) +AC_ARG_ENABLE([linuxconf], + [AC_HELP_STRING([--enable-linuxconf], + [enable 'newvserver' linuxconf module (default: no)])], + [case "$enableval" in + yes|no) ;; + *) AC_MSG_ERROR(['$i' is not a supported value for '--enable-linuxconf']);; + esac], + [enable_linuxconf=no]) + +AM_CONDITIONAL(ENSC_ENABLE_LINUXCONF, [test x"$enable_linuxconf" = xyes]) +AC_MSG_RESULT($enable_linuxconf) + + +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 ]) AC_CONFIG_FILES([util-vserver.spec Makefile]) AC_OUTPUT