added Vector_zeroEnd() function
[util-vserver.git] / util-vserver / configure.ac
index 577140b..c2282f3 100644 (file)
@@ -24,13 +24,15 @@ dnl distribution terms that you use for the rest of that program.
 dnl  
 
 AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.29.200, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.29.215, enrico.scholz@informatik.tu-chemnitz.de)
 AC_CONFIG_SRCDIR([src/capchroot.c])
 AC_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE([gnits dist-bzip2 subdir-objects])
 AM_MAINTAINER_MODE
 
+AC_SUBST(GPG_KEY, "0x7AE5D4B5922F7AF9!")
+
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
@@ -52,11 +54,20 @@ AC_PATH_PROGS(NICE,    [nice],    [nice],        [ $check_paths ])
 AC_PATH_PROGS(VCONFIG, [vconfig], [vconfig],     [ $check_paths ])
 AC_PATH_PROGS(WC,      [wc],      [wc],          [ $check_paths ])
 AC_PATH_PROGS(PS,      [ps],      [/bin/ps],     [ $check_paths ])
-AC_PATH_PROGS(XSLTPROC, [xsltproc], [xsltproc])
+AC_PATH_PROGS(MODPROBE, [modprobe], [/sbin/modprobe], [ $check_paths ])
+AC_PATH_PROGS(RMMOD,    [rmmod],    [/sbin/rmmod],    [ $check_paths ])
+AC_PATH_PROGS(NAMEIF,   [nameif],   [/sbin/nameif],   [ $check_paths ])
+AC_PATH_PROGS(IPTABLES, [iptables], [/sbin/iptables], [ $check_paths ])
+AC_PATH_PROGS(ENV,      [env],      [/usr/bin/env])
 AC_PATH_PROGS(SED,      [sed],      [sed])
 AC_PATH_PROGS(CMP,      [cmp],      [cmp])
 AC_PATH_PROGS(WGET,     [wget],     [wget])
 AC_PATH_PROGS(DOXYGEN,  [doxygen],  [:])
+AC_PATH_PROGS(TAR,      [tar])
+AC_PATH_PROGS(XSLTP,    [xsltp])
+
+AM_CONDITIONAL(HAVE_XSLTP, test "$XSLTP")
+       
 
 ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
 ENSC_CHECK_CXX_FLAG([-ansi   -Wall -pedantic -W -fmessage-length=0])
@@ -87,7 +98,7 @@ AC_ARG_VAR(CC, [The C compiler])
 
 ENSC_INITRDDIR(initrddir)
 ENSC_RELEASE(RELEASE_CPPFLAGS)
-ENSC_ENABLE_DIETLIBC(USE_DIETLIBC)
+ENSC_ENABLE_DIETLIBC(USE_DIETLIBC, [0.24])
 
 if test x"$ensc_have_dietlibc" = xno; then
        AC_MSG_WARN([***                                                         ***])
@@ -125,11 +136,11 @@ dnl Check for the APIs to be used
 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,ALL (default: ALL)])],
+                             [enable support for the given apis; possible values are: legacy,compat,v11,v13,fscompat,net,ALL (default: all except 'legacy')])],
               [],
-             [enable_apis=ALL])
+             [enable_apis=compat,v11,v13,fscompat,net])
 
-test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,v13,fscompat'
+test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,v13,fscompat,net'
 enable_api_oldproc=
 enable_api_olduts=
 old_IFS=$IFS
@@ -149,6 +160,7 @@ for i in $enable_apis; do
                                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]);;
                *)              AC_MSG_ERROR(['$i' is not a supported API]);;
        esac
@@ -170,6 +182,7 @@ 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>])
 
 dnl BIG HACK! Do some autodetection here!
 AC_DEFINE(UTMP_GID, [22], [The utmp gid-number])
@@ -188,7 +201,10 @@ test x"$ensc_cv_c99_c99compiler"    = xno || ensc_c99_affected=
 test x"$ensc_have_dietlibc"         = xno || ensc_diet_msg=
 test x"$ensc_have_dietlibc$ensc_cv_c_dietlibc_compat" = xyesyes || ensc_diet_compat_msg=
 
-FEATURES_TXT="Features:
+AH_BOTTOM([#include "compat.h"])
+AC_CONFIG_COMMANDS_PRE([
+                       FEATURES_TXT="\
+Features:
                       CC: $CC, $($CC   --version | sed -e '1p;d')
                       CXX: $CXX, $($CXX --version | sed -e '1p;d')
                  CPPFLAGS: '$CPPFLAGS'
@@ -212,9 +228,8 @@ Paths:
             Kernelheaders: $kernelincludedir
           vserver-Rootdir: $vserverdir
 "
-
-AH_BOTTOM([#include "compat.h"])
-AC_CONFIG_COMMANDS_PRE([echo "$FEATURES_TXT" >FEATURES.txt])
+                       echo "$FEATURES_TXT" >FEATURES.txt
+                       ])
 AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile lib/apidoc/Doxyfile])
 AC_OUTPUT