-dnl $Id: configure.ac,v 1.97 2005/07/15 20:25:06 ensc Exp $
+dnl $Id: configure.ac 2604 2007-09-02 20:03:17Z 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.208, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.30.214, vserver@list.linux-vserver.org)
AC_CONFIG_SRCDIR([src/capchroot.c])
AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([1.9 gnits dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([1.8.3 gnits dist-bzip2 subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_BUILD
AC_PROG_INSTALL
AC_PROG_LN_S
AM_PROG_CC_C_O
+AM_PATH_PYTHON(2.3)
ENSC_CXXCOMPILER
ENSC_C99COMPILER
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(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(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])
AC_MSG_CHECKING([whether to enable expensive tests])
AC_ARG_ENABLE([expensive-tests],
- [AC_HELP_STRING([--disable-expensive-tests],
+ [AC_HELP_STRING([--enable-expensive-tests],
[disable tests which might be expensive on some systems (default: no)])],
[case "$enableval" in
(yes|no) use_expensive_tests=$enableval;;
- (*) AC_MSG_ERROR(['$enableval' is not a valid value for '--disable-expensive-tests']);;
+ (*) AC_MSG_ERROR(['$enableval' is not a valid value for '--enable-expensive-tests']);;
esac],
- [ use_expensive_tests=yes ])
+ [ use_expensive_tests=no ])
AC_MSG_RESULT($use_expensive_tests)
AC_SUBST(ENSC_USE_EXPENSIVE_TESTS, "$use_expensive_tests")
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
dnl ##########################
-ENSC_KERNEL_HEADERS(kernelincludedir)
ENSC_UV_VROOTDIR(vserverdir)
-ENSC_CHANGELOG([trunk])
+ENSC_CHANGELOG
dnl ##########################
dnl
dnl {Check for the APIs to be used
dnl
+AH_TEMPLATE(VC_ENABLE_API_COMPAT, [Enable support for compatibility syscall API])
+AH_TEMPLATE(VC_ENABLE_API_LEGACY, [Enable support for old, /proc parsing API])
+AH_TEMPLATE(VC_ENABLE_API_V11, [Enable support for API of vserver 1.1.x])
+AH_TEMPLATE(VC_ENABLE_API_FSCOMPAT, [Enable support for filesystem compatibility API])
+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,v13,fscompat,net,ALL (default: all except 'legacy')])],
+ [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=compat,v11,v13,fscompat,net])
+ [enable_apis=v13,net,v21,v22,v23,netv2])
-test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,v13,fscompat,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
case "$i" in
- (compat) AC_DEFINE(VC_ENABLE_API_COMPAT, 1, [Enable support for compatibility syscall API])
- enable_api_oldproc=1
- enable_api_olduts=1
+ (compat) AC_DEFINE(VC_ENABLE_API_COMPAT, 1)
+ enable_api_oldproc=${enable_api_oldproc:-1}
+ enable_api_olduts=${enable_api_olduts:-1}
;;
- (legacy) AC_DEFINE(VC_ENABLE_API_LEGACY, 1, [Enable support for old, /proc parsing API])
- enable_api_old_proc=1
- enable_api_olduts=1
+ (legacy) AC_DEFINE(VC_ENABLE_API_LEGACY, 1)
+ enable_api_oldproc=${enable_api_oldproc:-1}
+ enable_api_olduts=${enable_api_olduts:-1}
;;
- (v11) AC_DEFINE(VC_ENABLE_API_V11, 1, [Enable support for API of vserver 1.1.x])
- enable_api_oldproc=1
- enable_api_olduts=1
+ (v11) AC_DEFINE(VC_ENABLE_API_V11, 1)
+ enable_api_oldproc=${enable_api_oldproc:-1}
+ enable_api_olduts=${enable_api_olduts:-1}
;;
- (v13) AC_DEFINE(VC_ENABLE_API_V13, 1, [Enable support for API of vserver 1.3.x]);;
- (net) AC_DEFINE(VC_ENABLE_API_NET, 1, [Enable support for network context API]);;
- (fscompat) AC_DEFINE(VC_ENABLE_API_FSCOMPAT, 1, [Enable support for filesystem compatibility API]);;
+ (fscompat) AC_DEFINE(VC_ENABLE_API_FSCOMPAT, 1);;
+ (v13obs) AC_DEFINE(VC_ENABLE_API_V13OBS, 1)
+ 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, [Enable API for a backward compatible /proc parsing])
- enable_apis="$enable_apis,oldproc"
+ AC_DEFINE(VC_ENABLE_API_OLDPROC, 1)
+ test x"$enable_api_oldproc" != x2 && enable_apis="$enable_apis,oldproc"
fi
if test x"$enable_api_olduts" != x; then
- AC_DEFINE(VC_ENABLE_API_OLDUTS, 1, [Enable API for a backward compatible uts handling])
- enable_apis="$enable_apis,olduts"
+ AC_DEFINE(VC_ENABLE_API_OLDUTS, 1)
+ test x"$enable_api_olduts" != x2 && enable_apis="$enable_apis,olduts"
fi
AC_MSG_RESULT([$enable_apis])
dnl
dnl ##########################
-ENSC_SYSCALLNR(vserver,273)
-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])
+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 ########################
+dnl ########################
+dnl
+dnl {check for libnl
+dnl
+
+ensc_have_libnl=yes
+LIBNL_ROOT=`readlink -f ../libnl*/`
+if test -d "$LIBNL_ROOT"; then
+ CFLAGS="$CFLAGS -I ${LIBNL_ROOT}/include"
+ LDFLAGS="$LDFLAGS -L${LIBNL_ROOT}/lib"
+fi
+
+if test x"$ensc_have_libnl" = xyes; then
+ AC_CHECK_HEADERS([asm/types.h stdint.h], [ : ],
+ [ ensc_have_libnl=no ])
+ AC_CHECK_TYPES([__s64], [ : ], [AC_DEFINE_UNQUOTED([__s64], [int64_t],
+ [Define this to a signed 64-bit integer type])],
+ [AC_INCLUDES_DEFAULT()
+#ifdef HAVE_ASM_TYPES_H
+# include <asm/types.h>
+#endif])
+ AC_CHECK_TYPES([__u64], [ : ], [AC_DEFINE_UNQUOTED([__u64], [uint64_t],
+ [Define this to an unsigned 64-bit integer type])],
+ [AC_INCLUDES_DEFAULT()
+#ifdef HAVE_ASM_TYPES_H
+# include <asm/types.h>
+#endif])
+fi
+
+if test x"$ensc_have_libnl" = xyes; then
+ AC_CHECK_HEADERS([netlink/netlink.h netlink/route/addr.h], [ : ],
+ [ ensc_have_libnl=no ], [AC_INCLUDES_DEFAULT()
+#ifdef HAVE_ASM_TYPES_H
+# include <asm/types.h>
+#endif]
+ )
+fi
+
+if test x"$ensc_have_libnl" = xyes; then
+ AC_CHECK_LIB(nl, nlmsg_get_src, [ : ],
+ [ ensc_have_libnl=no ])
+fi
+
+if test x"$ensc_have_libnl" != xyes; then
+ AC_MSG_WARN([
+****
+**** 'libnl' could not be found;
+**** this will disable the build of 'vip6-autod'
+****])
+fi
+
+AM_CONDITIONAL(ENSC_HAVE_LIBNL, test x"$ensc_have_libnl" = xyes)
+
+dnl
+dnl libnl stuff ends here}
+dnl
+dnl #######################
+
+dnl
+dnl Get python includes
+dnl
+
+AC_MSG_CHECKING([for python includes])
+PYTHON_INCLUDES=`python-config --includes 2>/dev/null`
+if test x"$PYTHON_INCLUDES" = x; then
+ python_inc_plat=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)"`
+ python_inc=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print get_python_inc()"`
+ if test x"$python_inc_plat" != x; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I$python_inc_plat"
+ fi
+ if test x"$python_inc" != x; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I$python_inc"
+ fi
+fi
+AC_MSG_RESULT([$PYTHON_INCLUDES])
+AC_SUBST(PYTHON_INCLUDES)
+
+
+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])
cfg-Directory: $sysconfdir/vservers
initrd-Directory: $initrddir
pkgstate-Directory: $localstatedir/run/vservers
- Kernelheaders: $kernelincludedir
vserver-Rootdir: $vserverdir
"
echo "$FEATURES_TXT" >FEATURES.txt
dnl
dnl ########################
-AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile lib/apidoc/Doxyfile])
+AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile lib/apidoc/Doxyfile python/Makefile])
AC_OUTPUT
AC_MSG_NOTICE([