X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=c86bd5a137d3a852271e2f95a6fd7fed2160114c;hb=48c61aa442df9e42a6451a3f2901879f42ea752f;hp=a727a397624f78f1fcb47b660f87c918c28eda82;hpb=cbffe71f71699596401af14cc96d25fccce56ad9;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index a727a39..c86bd5a 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -24,13 +24,14 @@ dnl distribution terms that you use for the rest of that program. dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.23.89.1, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.23.190.1, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([gnu dist-bzip2 subdir-objects]) AM_MAINTAINER_MODE +AC_SUBST(CVS2CL_TAG, []) # Checks for programs. AC_PROG_CXX @@ -40,6 +41,21 @@ AC_PROG_LN_S AC_PROG_RANLIB AM_PROG_CC_C_O +check_paths=$PATH:/sbin:/usr/sbin:/usr/local/sbin +AC_PATH_PROGS(AWK, [awk], [awk], [ $check_paths ]) +AC_PATH_PROGS(GREP, [grep], [grep], [ $check_paths ]) +AC_PATH_PROGS(IP, [ip], [ip], [ $check_paths ]) +AC_PATH_PROGS(MOUNT, [mount], [/bin/mount], [ $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_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]) AC_MSG_CHECKING([whether to enable dietlibc]) @@ -97,7 +113,33 @@ test "$kerneldir" -a -e $i/include/linux/version.h || { kernelincludedir=$kerneldir/include AC_SUBST(kernelincludedir) AC_MSG_RESULT($kernelincludedir/linux) - -AC_CONFIG_FILES([vserver.spec Makefile distrib/Makefile]) +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)])], + [], + [supported_apis=ALL]) + +test x"$supported_apis" != xALL || supported_apis='legacy,compat' +old_IFS=$IFS +IFS=,; +for i in $supported_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]);; + esac +done +IFS=$old_IFS +AC_MSG_RESULT([$supported_apis]) + +AC_CHECK_FUNCS([sys_virtual_context]) +AC_CHECK_DECLS(MS_MOVE,,,[#include ]) +AC_CHECK_TYPES(ctx_t,,,[#include ]) + +dnl BIG HACK! Do some autodetection here! +AC_DEFINE(UTMP_GID, [22], [The utmp gid-number]) + +AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile]) AC_OUTPUT