X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configure.ac;h=9a53649808f151cdab9d100e5c55916ec7813c32;hb=a741f6faf2baae1e823d334012f6a09e6a1bda51;hp=cfcd569f7ba0d6ff4a4ff292703ec1fa597b9500;hpb=4c80189d9747e21e5cd62bc38d9349e0584d8c50;p=util-vserver.git diff --git a/configure.ac b/configure.ac index cfcd569..9a53649 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -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 dnl @@ -24,7 +24,7 @@ dnl distribution terms that you use for the rest of that program. 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]) @@ -63,6 +63,7 @@ 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, [:]) @@ -226,18 +227,21 @@ AH_TEMPLATE(VC_ENABLE_API_V13OBS, [Enable support for some obsoleted API of vs 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 @@ -263,6 +267,9 @@ for i in $enable_apis; do (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]);; @@ -289,6 +296,7 @@ AC_CHECK_FUNCS([vserver]) AC_CHECK_DECLS(MS_MOVE,,,[#include ]) AC_CHECK_TYPES(xid_t,,,[#include ]) AC_CHECK_TYPES(nid_t,,,[#include ]) +AC_CHECK_TYPES(tag_t,,,[#include ]) AC_CHECK_HEADERS([sys/capability.h]) @@ -351,24 +359,18 @@ fi if test x"$ensc_have_libnl" = xyes; then AC_CHECK_HEADERS([asm/types.h stdint.h], [ : ], [ ensc_have_libnl=no ]) - for b in 8 16 32 64; do - for s in s u; do - ensc_libnl_stdint_type= - if test x"$s" = xu; then - ensc_libnl_stdint_type=u - fi - ensc_libnl_stdint_type="${ensc_libnl_stdint_type}int${b}_t" - AC_CHECK_TYPES([__${s}${b}], [ : ], - [AC_DEFINE_UNQUOTED([__${s}${b}], - [$ensc_libnl_stdint_type], - [__${s}${b} type])], - [AC_INCLUDES_DEFAULT() + 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 -#endif] - ) - done - done +#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 +#endif]) fi if test x"$ensc_have_libnl" = xyes; then @@ -381,7 +383,7 @@ if test x"$ensc_have_libnl" = xyes; then fi if test x"$ensc_have_libnl" = xyes; then - AC_CHECK_LIB(nl, rtnl_addr_alloc, [ : ], + AC_CHECK_LIB(nl, nlmsg_get_src, [ : ], [ ensc_have_libnl=no ]) fi @@ -400,6 +402,25 @@ 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]) @@ -479,7 +500,7 @@ dnl final info-page ends here} 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([