X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=32d1e83b8ede0814f63c04bd3e44b6f2f7dfd2e0;hb=a3093bf7ba9e93056bd6aabb30ed0d20210c345c;hp=0e85a570ed91dff32d9e7436a190705298a6516c;hpb=db7b38fc0b27d5ba870fb83de21bf601943bfabf;p=util-vserver.git diff --git a/configure.ac b/configure.ac index 0e85a57..32d1e83 100644 --- a/configure.ac +++ b/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.30.210, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.30.215, vserver@list.linux-vserver.org) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) @@ -42,6 +42,7 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S AM_PROG_CC_C_O +PKG_PROG_PKG_CONFIG ENSC_CXXCOMPILER ENSC_C99COMPILER @@ -56,6 +57,15 @@ ENSC_PATHPROG(NOHUP, nohup) 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(IONICE, ionice, [], [This is usually shipped in the 'util-linux(-ng)' or 'schedutils' package]) +ENSC_PATHPROG(FILE, file, [file]) +ENSC_PATHPROG(GZIP, gzip, [gzip]) +ENSC_PATHPROG(BZIP2, bzip2, [bzip2]) +ENSC_PATHPROG(CPIO, cpio, [cpio]) +ENSC_PATHPROG(RESTORE, restore, [restore]) +ENSC_PATHPROG(RSYNC, rsync, [rsync]) +ENSC_PATHPROG(STRACE, strace, [strace]) +ENSC_PATHPROG(FSCK, fsck) ENSC_PATHPROG(DOXYGEN, doxygen, [:]) ENSC_PATHPROG(XSLTP, xsltp, [:]) @@ -64,7 +74,10 @@ ENSC_PATHPROG(XSLTPROC, xsltproc, [:]) AM_CONDITIONAL(HAVE_XSLTP, test "$XSLTP" != ':') AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != ':') - + +if test x"$prefix" = x/; then + prefix= +fi ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W]) ENSC_CHECK_CXX_FLAG([-ansi -Wall -pedantic -W -fmessage-length=0]) @@ -128,6 +141,11 @@ AC_ARG_VAR(CC, [The C compiler]) ENSC_INITRDDIR(initrddir) ENSC_RELEASE(RELEASE_CPPFLAGS) +# HACK: This needs to be before ENSC_DIETLIBC_NEED_COMPAT, or the alternative +# syscalls will never be enabled for glibc. +ENSC_SYSCALLNR(vserver,273,[lib/syscall-fallback.h]) +ENSC_SYSCALL + dnl ########################### dnl dnl {some dietlibc related tests @@ -136,6 +154,8 @@ dnl case $host_cpu in (i*86|athlon) min_diet_ver=0.25;; (ia64|hppa*) min_diet_ver=0.29;; + (sparc*) min_diet_ver=0.30;; + (x86_64) min_diet_ver=0.27;; (*) min_diet_ver=0.28;; esac @@ -158,7 +178,6 @@ else # below. Therefore, this macro must not be called earlier. enable_static=no - ENSC_DIETLIBC_SANITYCHECK ENSC_DIETLIBC_NEED_COMPAT(USE_DIETLIBC_COMPAT) fi @@ -174,7 +193,7 @@ dnl ########################## ENSC_UV_VROOTDIR(vserverdir) -ENSC_CHANGELOG([trunk]) +ENSC_CHANGELOG dnl ########################## @@ -209,24 +228,26 @@ AH_TEMPLATE(VC_ENABLE_API_FSCOMPAT, [Enable support for filesystem compatibility AH_TEMPLATE(VC_ENABLE_API_V13OBS, [Enable support for some obsoleted API of vserver 1.3.x]) AH_TEMPLATE(VC_ENABLE_API_V13, [Enable support for API of vserver 1.3.x]) AH_TEMPLATE(VC_ENABLE_API_NET, [Enable support for network context API]) +AH_TEMPLATE(VC_ENABLE_API_V21, [Enable support for API of vserver 2.1.x]) +AH_TEMPLATE(VC_ENABLE_API_V22, [Enable support for API of vserver 2.2.x]) +AH_TEMPLATE(VC_ENABLE_API_V23, [Enable support for API of vserver 2.3.x]) +AH_TEMPLATE(VC_ENABLE_API_NETV2, [Enable support for new networking API]) AH_TEMPLATE(VC_ENABLE_API_OLDPROC, [Enable API for a backward compatible /proc parsing]) AH_TEMPLATE(VC_ENABLE_API_OLDUTS, [Enable API for a backward compatible uts handling]) 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,fscompat,v13obs,v13,net, ALL,NOLEGACY (default: v13,net)])], + [enable support for the given apis; possible values are: legacy,compat,v11,fscompat,v13obs,v13,net,v21,v22,v23,netv2 ALL,NOLEGACY (default: v13,net,v21,v22,v23,netv2)])], [], - [enable_apis=v13,net]) + [enable_apis=v13,net,v21,v22,v23,netv2]) -test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,fscompat,v13obs,v13,net' -test x"$enable_apis" != xNOLEGACY || enable_apis='compat,v11,fscompat,v13,net' +test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,fscompat,v13obs,v13,net,v21,v22,v23,netv2' +test x"$enable_apis" != xNOLEGACY || enable_apis='compat,v11,fscompat,v13,net,v21,v22,v23,netv2' enable_api_oldproc= enable_api_olduts= -old_IFS=$IFS -IFS=,; -for i in $enable_apis; do +echo $enable_apis | sed 's/,/\n/g' | while read i; do case "$i" in (compat) AC_DEFINE(VC_ENABLE_API_COMPAT, 1) enable_api_oldproc=${enable_api_oldproc:-1} @@ -245,12 +266,15 @@ for i in $enable_apis; do AC_DEFINE(VC_ENABLE_API_V13, 1);; (v13) AC_DEFINE(VC_ENABLE_API_V13, 1);; (net) AC_DEFINE(VC_ENABLE_API_NET, 1);; + (v21) AC_DEFINE(VC_ENABLE_API_V21, 1);; + (v22) AC_DEFINE(VC_ENABLE_API_V22, 1);; + (v23) AC_DEFINE(VC_ENABLE_API_V23, 1);; + (netv2) AC_DEFINE(VC_ENABLE_API_NETV2, 1);; (oldproc) enable_api_oldproc=2;; (olduts) enable_api_olduts=2;; (*) AC_MSG_ERROR(['$i' is not a supported API]);; esac done -IFS=$old_IFS if test x"$enable_api_oldproc" != x; then AC_DEFINE(VC_ENABLE_API_OLDPROC, 1) test x"$enable_api_oldproc" != x2 && enable_apis="$enable_apis,oldproc" @@ -266,21 +290,48 @@ dnl dnl ########################## -ENSC_SYSCALLNR(vserver,273,[lib/syscall-fallback.h]) -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_TYPES(tag_t,,,[#include ]) AC_CHECK_HEADERS([sys/capability.h]) +dnl vlogin might need -lutil +if test x"$ensc_have_dietlibc" = xno; then + AC_CHECK_FUNC([openpty],, [AC_CHECK_LIB([util], [openpty],, [AC_MSG_ERROR([ +**** +**** openpty could not be found +****])])]) +fi + + +dnl ######################## +dnl +dnl {crypto stuff +dnl +AC_ARG_WITH(crypto-api, + AC_HELP_STRING([--with-crypto-api=API], + [select crypto api to be used; possible values are `none', `nss', `beecrypt', `auto' (default:auto)]), + [case $withval in + (none|nss|beecrypt|auto) ensc_crypto_api=$withval;; + (yes) ensc_crypto_api=auto;; + (no) ensc_crypto_api=none;; + (*) AC_MSG_ERROR([invalid crypto-api value, only none,nss,beecrypt,auto are supported]);; + esac],[ensc_crypto_api=auto]) + + +dnl Now, check for matching crypto api. When selected 'auto', the +dnl first matching one wins dnl ######################## dnl dnl {check for beecrypt dnl +case $ensc_crypto_api in +(auto|beecrypt) if test x"$ensc_cv_c99_c99compiler" = xyes; then ensc_have_beecrypt=yes @@ -293,17 +344,20 @@ if test x"$ensc_cv_c99_c99compiler" = xyes; then AC_CHECK_LIB(beecrypt, hashFunctionContextInit, [ : ], [ ensc_have_beecrypt=no ]) fi - - if test x"$ensc_have_beecrypt" != xyes; then - AC_MSG_WARN([ -**** -**** 'beecrypt' could not be found; -**** this will disable the build of 'vhashify' -****]) - fi else ensc_have_beecrypt=no -fi +fi;; +esac + +case $ensc_crypto_api in +(auto) if test x"$ensc_have_beecrypt" = xyes; then + AC_MSG_NOTICE([using beecrypt as crypto api]) + ensc_crypto_api=beecrypt + fi;; +(beecrypt) if test x"$ensc_have_beecrypt" != xyes; then + AC_MSG_ERROR([beecrypt crypto api not found]) + fi;; +esac AM_CONDITIONAL(ENSC_HAVE_BEECRYPT, test x"$ensc_have_beecrypt" = xyes) AM_CONDITIONAL(ENSC_CAN_BEECRYPT_WITH_DIETLIBC, false) @@ -313,6 +367,125 @@ dnl dnl ######################## +dnl ######################## +dnl +dnl {check for nss +dnl + +case $ensc_crypto_api in +(nss) PKG_CHECK_MODULES(NSS, nss);; +(auto) PKG_CHECK_MODULES(NSS, nss, [ + AC_MSG_NOTICE([using NSS as crypto api]) + ensc_crypto_api=nss]);; +esac + +dnl +dnl nss stuff ends here} +dnl +dnl ######################## + +case $ensc_crypto_api in +(beecrypt) + ENSC_HAVE_CRYPTO=true + ENSC_CRYPTO_API=ENSC_CRYPTO_API_BEECRYPT + ENSC_CRYPTO_CFLAGS= + ENSC_CRYPTO_LIB=-lbeecrypt + ENSC_CAN_CRYPTO_WITH_DIETLIBC=false + ;; + +(nss) + ENSC_HAVE_CRYPTO=true + ENSC_CRYPTO_API=ENSC_CRYPTO_API_NSS + ENSC_CRYPTO_CFLAGS=$NSS_CFLAGS + ENSC_CRYPTO_LIB=$NSS_LIBS + ENSC_CAN_CRYPTO_WITH_DIETLIBC=false + ;; + +(none|auto) + ENSC_HAVE_CRYPTO=false + ENSC_CRYPTO_API=ENSC_CRYPTO_API_NONE + ENSC_CRYPTO_CFLAGS= + ENSC_CRYPTO_LIB= + ENSC_CAN_CRYPTO_WITH_DIETLIBC=false + + AC_MSG_WARN([No crypto api found/select. This will disable the build of 'vhashify']) + ;; + +(*) AC_MSG_ERROR([internal error]) +esac + +AM_CONDITIONAL(ENSC_HAVE_CRYPTO, $ENSC_HAVE_CRYPTO) +AM_CONDITIONAL(ENSC_CAN_CRYPTO_WITH_DIETLIBC, $ENSC_CAN_CRYPTO_WITH_DIETLIBC) +AC_SUBST(ENSC_CRYPTO_CFLAGS, $ENSC_CRYPTO_CFLAGS) +AC_SUBST(ENSC_CRYPTO_LIB, $ENSC_CRYPTO_LIB) +AC_DEFINE_UNQUOTED(ENSC_CRYPTO_API, $ENSC_CRYPTO_API, [Used crypto API]) + +dnl +dnl crypto stuff ends here} +dnl +dnl ######################## + + +dnl Check what distro this is, use Gentoo initscripts if appropriate +AC_MSG_CHECKING([for host initscripts]) +AC_ARG_WITH(initscripts, AC_HELP_STRING([--with-initscripts=TYPE], [force host initscripts; valid values are 'gentoo' and 'sysv' (default: guess)]), [ + case "$withval" in + gentoo) ensc_with_init=gentoo;; + sysv) ensc_with_init=sysv;; + *) AC_MSG_ERROR([invalid initscripts value, only gentoo and sysv are supported]);; + esac + ], [ + if test -e /etc/gentoo-release; then + ensc_with_init=gentoo + else + ensc_with_init=sysv + fi + ]) +AC_MSG_RESULT([$ensc_with_init]) +AM_CONDITIONAL(HAVE_GENTOO_INIT, test x"$ensc_with_init" = xgentoo) +AM_CONDITIONAL(HAVE_SYSV_INIT, test x"$ensc_with_init" = xsysv) + + +dnl ######################## +dnl Check for Python + +ensc_have_python=yes +AM_PATH_PYTHON([2.4],, [:]) +if test "x$PYTHON" = x:; then + ensc_have_python=no +fi +if test x$ensc_have_python = xyes; then + PYTHON_CFLAGS=-I`$PYTHON -c 'from distutils.sysconfig import get_python_inc; print get_python_inc(1)'` + PYTHON_LDFLAGS=-L`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'` + AC_SUBST(PYTHON_CFLAGS) + AC_SUBST(PYTHON_LDFLAGS) +else + ensc_have_python=no +fi +AC_PATH_PROG([CTAGS], [ctags], [no]) +if test "x$CTAGS" = xno; then + ensc_have_python=no +fi +AM_CONDITIONAL([HAVE_PYTHON], [test x$ensc_have_python = xyes]) + +dnl Python stuff ends here +dnl ######################## + + +dnl ######################## +dnl Library versioning + +ensc_have_versioning=yes +AC_ARG_ENABLE(versioning, AC_HELP_STRING([--disable-versioning], [Disable library versioning]), [ensc_have_versioning="$enableval"]) +AM_CONDITIONAL([HAVE_VERSIONING], [test "x$ensc_have_versioning" = xyes]) +if test "x$ensc_have_versioning" = xyes; then + AC_DEFINE([HAVE_VERSIONING], [1], [Define this to use library versioning]) +fi + +dnl /Library versioning +dnl ######################## + + dnl BIG HACK! Do some autodetection here! AC_DEFINE(UTMP_GID, [22], [The utmp gid-number]) @@ -355,6 +528,9 @@ Features: ext2fs Source: $ensc_cv_test_ext2fs_header syscall(2) invocation: $with_syscall vserver(2) syscall#: $ensc_cv_value_syscall_vserver + crypto api: $ensc_crypto_api + python bindings: $ensc_have_python + use library versioning: $ensc_have_versioning Paths: prefix: $prefix