X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=a3a475da3e496341dac5a6187aac478e1cb8abc9;hb=b38d70e7594b43cdd63b9e27ea5783001ef8407c;hp=87e96cae436b5e64b491987cc24d64b56e429a7c;hpb=7a086b2e090b5c559904229f5f6316e9ccddeba2;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 87e96ca..a3a475d 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -24,22 +24,20 @@ dnl distribution terms that you use for the rest of that program. dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.23.194, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.26.195, 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_LIBTOOL +dnl AC_PROG_RANLIB +AC_PROG_LIBTOOL AM_PROG_CC_C_O ENSC_CXXCOMPILER @@ -53,11 +51,6 @@ 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_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]) @@ -84,85 +77,61 @@ else 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([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], - [: ${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]) -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) +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])