dnl
AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.30.210, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.30.213, vserver@list.linux-vserver.org)
AC_CONFIG_SRCDIR([src/capchroot.c])
AC_CONFIG_HEADER([config.h])
ENSC_PATHPROG(BZIP2, bzip2, [bzip2])
ENSC_PATHPROG(CPIO, cpio, [cpio])
ENSC_PATHPROG(RESTORE, restore, [restore])
+ENSC_PATHPROG(RSYNC, rsync, [rsync])
ENSC_PATHPROG(DOXYGEN, doxygen, [:])
ENSC_PATHPROG(XSLTP, xsltp, [:])
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])
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
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
# below. Therefore, this macro must not be called earlier.
enable_static=no
- ENSC_DIETLIBC_SANITYCHECK
ENSC_DIETLIBC_NEED_COMPAT(USE_DIETLIBC_COMPAT)
fi
ENSC_UV_VROOTDIR(vserverdir)
-ENSC_CHANGELOG([trunk])
+ENSC_CHANGELOG
dnl ##########################
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_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, ALL,NOLEGACY (default: v13,net,v21)])],
[],
- [enable_apis=v13,net])
+ [enable_apis=v13,net,v21])
-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'
+test x"$enable_apis" != xNOLEGACY || enable_apis='compat,v11,fscompat,v13,net,v21'
enable_api_oldproc=
enable_api_olduts=
old_IFS=$IFS
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);;
(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_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 ########################
+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])