-dnl $Id: configure.ac 2539 2007-05-02 20:11:40Z dhozac $
+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.213, vserver@list.linux-vserver.org)
+AC_INIT(util-vserver, 0.30.214, vserver@list.linux-vserver.org)
AC_CONFIG_SRCDIR([src/capchroot.c])
AC_CONFIG_HEADER([config.h])
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, [:])
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]);;
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
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([netlink/netlink.h netlink/route/addr.h], [ : ],
+ 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_LIB(nl, rtnl_addr_alloc, [ : ],
+ 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
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])
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([