-dnl $Id: configure.ac 2422 2006-12-09 16:13:54Z dhozac $
+dnl $Id: configure.ac 2706 2008-03-17 08:59:37Z dhozac $
dnl Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
dnl
dnl
AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.30.212, 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])
AC_PROG_INSTALL
AC_PROG_LN_S
AM_PROG_CC_C_O
+PKG_PROG_PKG_CONFIG
ENSC_CXXCOMPILER
ENSC_C99COMPILER
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, [:])
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
(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
# below. Therefore, this macro must not be called earlier.
enable_static=no
- ENSC_DIETLIBC_SANITYCHECK
ENSC_DIETLIBC_NEED_COMPAT(USE_DIETLIBC_COMPAT)
fi
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,v21)])],
+ [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,v21])
+ [enable_apis=v13,net,v21,v22,v23,netv2])
-test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,fscompat,v13obs,v13,net,v21'
-test x"$enable_apis" != xNOLEGACY || enable_apis='compat,v11,fscompat,v13,net,v21'
+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
(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]);;
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 <linux/fs.h>])
AC_CHECK_TYPES(xid_t,,,[#include <sys/types.h>])
AC_CHECK_TYPES(nid_t,,,[#include <sys/types.h>])
+AC_CHECK_TYPES(tag_t,,,[#include <sys/types.h>])
AC_CHECK_HEADERS([sys/capability.h])
fi
+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]);;
+ esac],[ensc_crypto_api=auto])
+AC_MSG_RESULT($ensc_crypto_api)
+
+
+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
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)
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],
+ AC_MSG_RESULT(no));;
+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)
+ 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 BIG HACK! Do some autodetection here!
AC_DEFINE(UTMP_GID, [22], [The utmp gid-number])
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
Paths:
prefix: $prefix
git://git.onelab.eu / util-vserver.git / blobdiff