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])
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])
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
(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
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])
AM_CONDITIONAL(HAVE_SYSV_INIT, test x"$ensc_with_init" = xsysv)
+dnl ########################
+dnl Check for Python
+
+AM_PATH_PYTHON(,, [:])
+if test "x$PYTHON" != x:; then
+ ensc_have_python=true
+else
+ ensc_have_python=false
+fi
+ensc_python_config=python-config
+AC_ARG_WITH(python, AC_HELP_STRING([--with-python=FILE], [use FILE to query Python build details (default: python-config)]), [
+ case "$withval" in
+ (no) ensc_have_python=false;;
+ (yes) ;;
+ (*) ensc_python_config="$withval";;
+ esac])
+if $ensc_have_python && $ensc_python_config --cflags > /dev/null 2>&1; then
+ PYTHON_CFLAGS=`$ensc_python_config --cflags`
+ PYTHON_LDFLAGS=`$ensc_python_config --ldflags`
+ AC_SUBST(PYTHON_CFLAGS)
+ AC_SUBST(PYTHON_LDFLAGS)
+else
+ ensc_have_python=false
+fi
+AM_CONDITIONAL([HAVE_PYTHON], [$ensc_have_python])
+
+dnl Python stuff ends here
+dnl ########################
+
+
dnl BIG HACK! Do some autodetection here!
AC_DEFINE(UTMP_GID, [22], [The utmp gid-number])