X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=534145241dd6fa5e91b170e88e821153c68dace4;hb=80049ce2463ce38e69ddde49fb527c1efae49f73;hp=01280901f7702979ee0bb4fc737d0a8850107df4;hpb=0d37f8b4b9a2fa1ec6b7bf43b3d16a256cc23ef1;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 0128090..5341452 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.29.192, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.29.208, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) @@ -52,10 +52,16 @@ 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(PS, [ps], [/bin/ps], [ $check_paths ]) +AC_PATH_PROGS(MODPROBE, [modprobe], [/sbin/modprobe], [ $check_paths ]) +AC_PATH_PROGS(RMMOD, [rmmod], [/sbin/rmmod], [ $check_paths ]) +AC_PATH_PROGS(NAMEIF, [nameif], [/sbin/nameif], [ $check_paths ]) +AC_PATH_PROGS(IPTABLES, [iptables], [/sbin/iptables], [ $check_paths ]) AC_PATH_PROGS(XSLTPROC, [xsltproc], [xsltproc]) AC_PATH_PROGS(SED, [sed], [sed]) AC_PATH_PROGS(CMP, [cmp], [cmp]) AC_PATH_PROGS(WGET, [wget], [wget]) +AC_PATH_PROGS(DOXYGEN, [doxygen], [:]) +AC_PATH_PROGS(TAR, [tar]) ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W]) ENSC_CHECK_CXX_FLAG([-ansi -Wall -pedantic -W -fmessage-length=0]) @@ -86,7 +92,7 @@ AC_ARG_VAR(CC, [The C compiler]) ENSC_INITRDDIR(initrddir) ENSC_RELEASE(RELEASE_CPPFLAGS) -ENSC_ENABLE_DIETLIBC(USE_DIETLIBC) +ENSC_ENABLE_DIETLIBC(USE_DIETLIBC, [0.24]) if test x"$ensc_have_dietlibc" = xno; then AC_MSG_WARN([*** ***]) @@ -95,8 +101,12 @@ if test x"$ensc_have_dietlibc" = xno; then AC_MSG_WARN([*** chroot() environments, so you have to expect problems ***]) AC_MSG_WARN([*** there. ***]) AC_MSG_WARN([*** ***]) + AM_CONDITIONAL(USE_DIETLIBC_COMPAT, false) +else + ENSC_DIETLIBC_NEED_COMPAT(USE_DIETLIBC_COMPAT) fi + ENSC_KERNEL_HEADERS(kernelincludedir) ENSC_UV_VROOTDIR(vserverdir) ENSC_CHANGELOG([trunk]) @@ -173,21 +183,19 @@ 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 ensc_cxx_affected=" (affected: vbuild, vcheck)" -ensc_c99_affected=" (affected: vunify)" +ensc_c99_affected=" (affected: vunify, vcopy)" ensc_diet_msg=" (you have been warned)" -test x"$ensc_cv_cxx_cxxcompiler" = xno || ensc_cxx_affected= -test x"$ensc_cv_c99_c99compiler" = xno || ensc_c99_affected= -test x"$ensc_have_dietlibc" = xno || ensc_diet_msg= - -AC_MSG_NOTICE([ - -$PACKAGE_STRING +ensc_diet_compat_msg=" (using -lcompat)" +test x"$ensc_cv_cxx_cxxcompiler" = xno || ensc_cxx_affected= +test x"$ensc_cv_c99_c99compiler" = xno || ensc_c99_affected= +test x"$ensc_have_dietlibc" = xno || ensc_diet_msg= +test x"$ensc_have_dietlibc$ensc_cv_c_dietlibc_compat" = xyesyes || ensc_diet_compat_msg= +AH_BOTTOM([#include "compat.h"]) +AC_CONFIG_COMMANDS_PRE([ + FEATURES_TXT="\ Features: CC: $CC, $($CC --version | sed -e '1p;d') CXX: $CXX, $($CXX --version | sed -e '1p;d') @@ -195,7 +203,7 @@ Features: CFLAGS: '$CFLAGS' CXXFLAGS: '$CXXFLAGS' build/host: $build/$host - Use dietlibc: $ensc_have_dietlibc$ensc_diet_msg + Use dietlibc: $ensc_have_dietlibc$ensc_diet_msg$ensc_diet_compat_msg Build C++ programs: $ensc_cv_cxx_cxxcompiler$ensc_cxx_affected Build C99 programs: $ensc_cv_c99_c99compiler$ensc_c99_affected Available APIs: $enable_apis @@ -208,6 +216,17 @@ Paths: sysconf-Directory: $sysconfdir cfg-Directory: $sysconfdir/vservers initrd-Directory: $initrddir + pkgstate-Directory: $localstatedir/run/vservers Kernelheaders: $kernelincludedir vserver-Rootdir: $vserverdir -]) +" + echo "$FEATURES_TXT" >FEATURES.txt + ]) +AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile lib/apidoc/Doxyfile]) +AC_OUTPUT + +AC_MSG_NOTICE([ + +$PACKAGE_STRING + +$FEATURES_TXT])