added lockfile
[util-vserver.git] / util-vserver / configure.ac
index f173828..5341452 100644 (file)
@@ -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.28.192, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.29.208, enrico.scholz@informatik.tu-chemnitz.de)
 AC_CONFIG_SRCDIR([src/capchroot.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -52,9 +52,16 @@ 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(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(XSLTPROC, [xsltproc], [xsltproc])
 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])
 
 ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
 ENSC_CHECK_CXX_FLAG([-ansi   -Wall -pedantic -W -fmessage-length=0])
@@ -85,7 +92,21 @@ 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([***                                                         ***])
+       AC_MSG_WARN([*** it is strongly recommended to link util-vserver against ***])
+       AC_MSG_WARN([*** dietlibc;  glibc's NSS functions are very unreliable in ***])
+       AC_MSG_WARN([*** chroot() environments,  so you have to  expect problems ***])
+       AC_MSG_WARN([*** there.                                                  ***])
+       AC_MSG_WARN([***                                                         ***])
+       AM_CONDITIONAL(USE_DIETLIBC_COMPAT, false)
+else
+       ENSC_DIETLIBC_NEED_COMPAT(USE_DIETLIBC_COMPAT)
+fi
+
+
 ENSC_KERNEL_HEADERS(kernelincludedir)
 ENSC_UV_VROOTDIR(vserverdir)
 ENSC_CHANGELOG([trunk])
@@ -148,6 +169,8 @@ if test x"$enable_api_olduts" != x; then
 fi
 AC_MSG_RESULT([$enable_apis])
 
+ENSC_SYSCALLNR(vserver,273)
+ENSC_SYSCALL
 ENSC_CHECK_EXT2FS_HEADER
 AC_CHECK_FUNCS([vserver])
 AC_CHECK_DECLS(MS_MOVE,,,[#include <linux/fs.h>])
@@ -160,34 +183,50 @@ if false; then
        AC_DEFINE(HAVE_GROWING_STACK, [1], [Define to 1 if the stack is on growing addresses])
 fi
 
+
+ensc_cxx_affected=" (affected: vbuild, vcheck)"
+ensc_c99_affected=" (affected: vunify, vcopy)"
+ensc_diet_msg=" (you have been warned)"
+ensc_diet_compat_msg=" (using -lcompat)"
+test x"$ensc_cv_cxx_cxxcompiler"    = xno || ensc_cxx_affected=
+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=
+
 AH_BOTTOM([#include "compat.h"])
-AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile])
+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'
+                   CFLAGS: '$CFLAGS'
+                 CXXFLAGS: '$CXXFLAGS'
+               build/host: $build/$host
+             Use dietlibc: $ensc_have_dietlibc$ensc_diet_msg$ensc_diet_compat_msg
+       Build C++ programs: $ensc_cv_cxx_cxxcompiler$ensc_cxx_affected
+       Build C99 programs: $ensc_cv_c99_c99compiler$ensc_c99_affected
+           Available APIs: $enable_apis
+            ext2fs Source: $ensc_cv_test_ext2fs_header
+    syscall(2) invocation: $with_syscall
+      vserver(2) syscall#: $ensc_cv_value_syscall_vserver
+   
+Paths:
+                   prefix: $prefix
+        sysconf-Directory: $sysconfdir
+            cfg-Directory: $sysconfdir/vservers
+         initrd-Directory: $initrddir
+       pkgstate-Directory: $localstatedir/run/vservers
+            Kernelheaders: $kernelincludedir
+          vserver-Rootdir: $vserverdir
+"
+                       echo "$FEATURES_TXT" >FEATURES.txt
+                       ])
+AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile lib/apidoc/Doxyfile])
 AC_OUTPUT
 
-ensc_cxx_affected=
-ensc_c99_affected=
-test x"$ensc_cv_cxx_cxxcompiler" = xyes || ensc_cxx_affected=" (affected: vbuild, vcheck)"
-test x"$ensc_cv_c99_c99compiler" = xyes || ensc_c99_affected=" (affected: vunify)"
-
 AC_MSG_NOTICE([
 
 $PACKAGE_STRING
 
-Features:
-              CPPFLAGS: '$CPPFLAGS'
-                CFLAGS: '$CFLAGS'
-              CXXFLAGS: '$CXXFLAGS'
-          Use dietlibc: $ensc_have_dietlibc
-    Build C++ programs: $ensc_cv_cxx_cxxcompiler$ensc_cxx_affected
-    Build C99 programs: $ensc_cv_c99_c99compiler$ensc_c99_affected
-        Available APIs: $enable_apis
-         ext2fs Source: $ensc_cv_test_ext2fs_header
-
-Paths:
-                prefix: $prefix
-     sysconf-Directory: $sysconfdir
-         cfg-Directory: $sysconfdir/vservers
-      initrd-Directory: $initrddir
-         Kernelheaders: $kernelincludedir
-       vserver-Rootdir: $vserverdir
-])
+$FEATURES_TXT])