X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=87e96cae436b5e64b491987cc24d64b56e429a7c;hb=332283f4293d66f246313019230d99d633ff7e62;hp=e02efe39dd0098745b1067c64be2524380ed133f;hpb=ab7022af528ada13152ad1fdfdf7eaf11ab976dc;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index e02efe3..87e96ca 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -24,11 +24,11 @@ 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.194, 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_INIT_AUTOMAKE([gnits dist-bzip2 subdir-objects]) AM_MAINTAINER_MODE AC_SUBST(CVS2CL_TAG, []) @@ -39,21 +39,50 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_RANLIB +dnl AC_PROG_LIBTOOL AM_PROG_CC_C_O +ENSC_CXXCOMPILER 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], [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_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(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_CHECK_PROGS(CVS2CL, [cvs2cl]) AM_CONDITIONAL(HAVE_CVS2CL, [test x"$CVS2CL" != x]) -ENSC_CHECK_CC_FLAG([-std=c99]) +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]) + +ENSC_FPIC_SYSCALL + + +AC_MSG_CHECKING([whether to enable debug-code in library]) +AC_ARG_ENABLE([lib-debug], + [AC_HELP_STRING([--enable-lib-debug], + [enable additional debug code in library (default: no)])], + [case "$enableval" in + yes) use_lib_debug=1;; + no) use_lib_debug=;; + *) AC_MSG_ERROR(['$enableval' is not a valid value for '--enable-lib-debug']);; + esac], + [ use_lib_debug= ]) + +if test x"$use_lib_debug" = x; then + AC_SUBST(LIB_DEBUG_CPPFLAGS, [-DNDEBUG]) + AC_MSG_RESULT(no) +else + AC_SUBST(LIB_DEBUG_CPPFLAGS, []) + AC_MSG_RESULT(yes) +fi AC_MSG_CHECKING([whether to enable dietlibc]) AC_ARG_ENABLE([dietlibc], @@ -110,7 +139,38 @@ test "$kerneldir" -a -e $i/include/linux/version.h || { kernelincludedir=$kerneldir/include AC_SUBST(kernelincludedir) AC_MSG_RESULT($kernelincludedir/linux) - +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]) + +if false; then + AC_DEFINE(HAVE_GROWING_STACK, [1], [Define to 1 if the stack is on growing addresses]) +fi + +AH_BOTTOM([#include "compat.h"]) AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile]) AC_OUTPUT