X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=e5c68548d81c62ca8e04f929ac54ecf64753e2f1;hb=33aeea2e3003388655c554b74e7c5a73cb746d9e;hp=36b6685e79da027d1e582b2f7969f4ab81d32833;hpb=df13e5523df231124858003c93bdaa3b7a361f07;p=util-vserver.git diff --git a/configure.ac b/configure.ac index 36b6685..e5c6854 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.214, vserver@list.linux-vserver.org) +AC_INIT(util-vserver, 0.30.215, vserver@list.linux-vserver.org) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) @@ -57,6 +57,7 @@ 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]) @@ -314,15 +315,15 @@ dnl ######################## dnl dnl {crypto stuff dnl -AC_MSG_CHECKING([for used crypto API]) 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;; - (*) AC_MSG_ERROR([invalid initscripts value, only gentoo and sysv are supported]);; + (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]) -AC_MSG_RESULT($ensc_crypto_api) dnl Now, check for matching crypto api. When selected 'auto', the @@ -378,8 +379,7 @@ 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], - AC_MSG_RESULT(no));; + ensc_crypto_api=nss]);; esac dnl @@ -404,14 +404,14 @@ case $ensc_crypto_api in ENSC_CAN_CRYPTO_WITH_DIETLIBC=false ;; -(none) +(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_WARN([No crypto api found/select. This will disable the build of 'vhashify']) ;; (*) AC_MSG_ERROR([internal error])