X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=438aaf0ff8e59430ae1c4ca61566ea54afc32a92;hb=4d2c4b39698f7d18cde9329ebd2030d458c6eaa9;hp=453545162496aac5b2da03e62830df431590b134;hpb=b78a6481837a249c22d9fa1fd91484a4eda92365;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 4535451..438aaf0 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -24,13 +24,18 @@ dnl distribution terms that you use for the rest of that program. dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.28.193, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.30.204, 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_INIT_AUTOMAKE([1.9 gnits dist-bzip2 subdir-objects]) AM_MAINTAINER_MODE +AC_CANONICAL_BUILD +AC_CANONICAL_HOST + +AC_SUBST(GPG_KEY, "0xFFD316AC53ACA43A!") + # Checks for programs. AC_PROG_CXX AC_PROG_CC @@ -42,20 +47,24 @@ AM_PROG_CC_C_O ENSC_CXXCOMPILER ENSC_C99COMPILER -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(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_PATH_PROGS(PS, [ps], [/bin/ps], [ $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]) +ENSC_SET_SEARCHPATH([$PATH:/sbin:/usr/sbin:/usr/local/sbin]) +ENSC_PATHPROG_STANDARD_TOOLS + +ENSC_PATHPROG(IP, ip,, [Usually, this tool is shipped in the 'iproute' or 'iproute2' package of your distribution]) +ENSC_PATHPROG(IPTABLES, iptables) +ENSC_PATHPROG(MODPROBE, modprobe) +ENSC_PATHPROG(NAMEIF, nameif) +ENSC_PATHPROG(RMMOD, rmmod) +ENSC_PATHPROG(VCONFIG, vconfig,, [See http://www.candelatech.com/~greear/vlan.html; usually this tool is shipped in the 'vconfig' or 'vlan' package of your distribution]) +ENSC_PATHPROG(WGET, wget) + +ENSC_PATHPROG(DOXYGEN, doxygen, [:]) +ENSC_PATHPROG(XSLTP, xsltp, [:]) +ENSC_PATHPROG(XSLTPROC, xsltproc, [:]) + + +AM_CONDITIONAL(HAVE_XSLTP, test "$XSLTP" != ':') + ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W]) ENSC_CHECK_CXX_FLAG([-ansi -Wall -pedantic -W -fmessage-length=0]) @@ -86,7 +95,22 @@ 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([*** ***]) + AC_MSG_WARN([*** it is strongly recommended to link util-vserver against ***]) + AC_MSG_WARN([*** dietlibc; glibc's NSS functions are very unreliable in ***]) + 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_SANITYCHECK + ENSC_DIETLIBC_NEED_COMPAT(USE_DIETLIBC_COMPAT) +fi + + ENSC_KERNEL_HEADERS(kernelincludedir) ENSC_UV_VROOTDIR(vserverdir) ENSC_CHANGELOG([trunk]) @@ -110,11 +134,11 @@ 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,v11,v13,fscompat,ALL (default: ALL)])], + [enable support for the given apis; possible values are: legacy,compat,v11,v13,fscompat,net,ALL (default: all except 'legacy')])], [], - [enable_apis=ALL]) + [enable_apis=compat,v11,v13,fscompat,net]) -test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,v13,fscompat' +test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,v13,fscompat,net' enable_api_oldproc= enable_api_olduts= old_IFS=$IFS @@ -134,6 +158,7 @@ for i in $enable_apis; do enable_api_olduts=1 ;; v13) AC_DEFINE(VC_ENABLE_API_V13, 1, [Enable support for API of vserver 1.3.x]);; + net) AC_DEFINE(VC_ENABLE_API_NET, 1, [Enable support for network context API]);; fscompat) AC_DEFINE(VC_ENABLE_API_FSCOMPAT, 1, [Enable support for filesystem compatibility API]);; *) AC_MSG_ERROR(['$i' is not a supported API]);; esac @@ -149,10 +174,15 @@ if test x"$enable_api_olduts" != x; then fi AC_MSG_RESULT([$enable_apis]) +ENSC_SYSCALLNR(vserver,273) +ENSC_SYSCALL ENSC_CHECK_EXT2FS_HEADER AC_CHECK_FUNCS([vserver]) AC_CHECK_DECLS(MS_MOVE,,,[#include ]) AC_CHECK_TYPES(xid_t,,,[#include ]) +AC_CHECK_TYPES(nid_t,,,[#include ]) + +AC_CHECK_HEADERS([sys/capability.h]) dnl BIG HACK! Do some autodetection here! AC_DEFINE(UTMP_GID, [22], [The utmp gid-number]) @@ -161,34 +191,52 @@ if false; then AC_DEFINE(HAVE_GROWING_STACK, [1], [Define to 1 if the stack is on growing addresses]) fi + +ensc_cxx_affected=" (affected: vbuild, vcheck)" +ensc_c99_affected=" (affected: vunify, vcopy)" +ensc_diet_msg=" (you have been warned)" +ensc_diet_version_msg=" ($ensc_version_dietlibc)" +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_version_dietlibc" != x || ensc_diet_version_msg= +test x"$ensc_have_dietlibc$ensc_cv_c_dietlibc_compat" = xyesyes || ensc_diet_compat_msg= + AH_BOTTOM([#include "compat.h"]) -AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile]) +AC_CONFIG_COMMANDS_PRE([ + FEATURES_TXT="\ +Features: + CC: $CC, $($CC --version | sed -e '1p;d') + CXX: $CXX, $($CXX --version | sed -e '1p;d') + CPPFLAGS: '$CPPFLAGS' + CFLAGS: '$CFLAGS' + CXXFLAGS: '$CXXFLAGS' + build/host: $build/$host + Use dietlibc: $ensc_have_dietlibc$ensc_diet_version_msg$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 + ext2fs Source: $ensc_cv_test_ext2fs_header + syscall(2) invocation: $with_syscall + vserver(2) syscall#: $ensc_cv_value_syscall_vserver + +Paths: + prefix: $prefix + 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 -ensc_cxx_affected= -ensc_c99_affected= -test x"$ensc_cv_cxx_cxxcompiler" = xyes || ensc_cxx_affected=" (affected: vbuild, vcheck)" -test x"$ensc_cv_c99_c99compiler" = xyes || ensc_c99_affected=" (affected: vunify)" - AC_MSG_NOTICE([ $PACKAGE_STRING -Features: - CPPFLAGS: '$CPPFLAGS' - CFLAGS: '$CFLAGS' - CXXFLAGS: '$CXXFLAGS' - Use dietlibc: $ensc_have_dietlibc - Build C++ programs: $ensc_cv_cxx_cxxcompiler$ensc_cxx_affected - Build C99 programs: $ensc_cv_c99_c99compiler$ensc_c99_affected - Available APIs: $enable_apis - ext2fs Source: $ensc_cv_test_ext2fs_header - -Paths: - prefix: $prefix - sysconf-Directory: $sysconfdir - cfg-Directory: $sysconfdir/vservers - initrd-Directory: $initrddir - Kernelheaders: $kernelincludedir - vserver-Rootdir: $vserverdir -]) +$FEATURES_TXT])