merge to 0.30.212
Marc Fiuczynski [Thu, 18 Jan 2007 16:34:29 +0000 (16:34 +0000)]
47 files changed:
Makefile.am
Makefile.in
aclocal.m4
config.guess
config.sub
configure
configure.ac
contrib/manifest.dat.pathsubst
distrib/Makefile.am
distrib/Makefile.in
kernel/context.h [deleted file]
kernel/cvirt.h [deleted file]
kernel/cvirt_def.h [deleted file]
kernel/debug.h [deleted file]
kernel/dlimit.h [deleted file]
kernel/inode.h [deleted file]
kernel/limit.h [deleted file]
kernel/limit_def.h [deleted file]
kernel/namespace.h [deleted file]
kernel/namespace_cmd.h [deleted file]
kernel/sched.h [deleted file]
kernel/sched_def.h [deleted file]
kernel/xid.h [deleted file]
lib/Makefile-files
lib/cflags-v13.c
lib/getinsecurebcaps.c
lib/ioctl-getext2flags.hc
lib/ioctl-setext2flags.hc
lib/syscall_setsched-v13.hc
lib/syscall_setsched.c
lib/virtual.h
lib/vserver-internal.h
lib/vserver.h
m4/ensc_kerneldir.m4 [deleted file]
scripts/Makefile-files
scripts/legacy/vserver
scripts/util-vserver-vars.pathsubst
scripts/vserver
src/Makefile-files
src/chcontext.c
src/showattr.c
src/vdlimit.c
src/vdu.c
src/vlimit.c
sysv/Makefile-files
util-vserver.spec
util-vserver.spec.in

index 068605c..dd30d82 100644 (file)
@@ -1,6 +1,6 @@
-## $Id: Makefile.am,v 1.70 2005/07/03 17:51:00 ensc Exp $
+## $Id: Makefile.am 2367 2006-11-03 19:59:15Z dhozac $
 
-# Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+# Copyright (C) 2003,2004,2005,2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
 ACLOCAL_AMFLAGS                =  -I m4
 SUBDIRS                        =  . distrib
 
-CVS2CL_AMFLAGS         =  $(CVS2CL_TAG) -U cvsusers.map --show-dead -S --no-wrap
-CVS2CL_ALLFLAGS        :=  $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS)
+SVN2CL_AMFLAGS         =  $(SVN2CL_TAG) --authors=svnusers.map
+SVN2CL_ALLFLAGS        :=  $(SVN2CL_AMFLAGS) $(SVN2CL_FLAGS)
 
 confdir                        =  $(sysconfdir)/vservers
 confdefaultsdir                =  $(confdir)/.defaults
@@ -53,36 +53,12 @@ sysconf_DATA =
 
 DIETPROGS =            $(LIBENSCVECTOR_DIET)
 
-BUILT_SOURCES =                pathconfig.h linuxvirtual.h \
+BUILT_SOURCES =                pathconfig.h \
                        .fixups
 
 man_MANS =
 
-kernel_HDRS =          kernel/context.h        \
-                       kernel/context_cmd.h    \
-                       kernel/cvirt.h          \
-                       kernel/cvirt_cmd.h      \
-                       kernel/cvirt_def.h      \
-                       kernel/debug.h          \
-                       kernel/debug_cmd.h      \
-                       kernel/dlimit.h         \
-                       kernel/dlimit_cmd.h     \
-                       kernel/inode.h          \
-                       kernel/inode_cmd.h      \
-                       kernel/legacy.h         \
-                       kernel/limit.h          \
-                       kernel/limit_cmd.h      \
-                       kernel/limit_def.h      \
-                       kernel/namespace.h      \
-                       kernel/namespace_cmd.h  \
-                       kernel/network.h        \
-                       kernel/network_cmd.h    \
-                       kernel/sched.h          \
-                       kernel/sched_cmd.h      \
-                       kernel/sched_def.h      \
-                       kernel/signal_cmd.h     \
-                       kernel/switch.h         \
-                       kernel/xid.h
+kernel_HDRS =          $(wildcard kernel/*.h)
 
 
 EXTRA_PROGRAMS =
@@ -127,23 +103,16 @@ endif
 VSERVER_LDADDS =       $(LIBVSERVER) $(DIET_COMPAT_LDADDS)
 
 silent.%:              FORCE
-                       @t=$$(mktemp /tmp/build.XXXXXX) && \
-                       $(MAKE) '$*' -s 2>$$t >/dev/null && \
-                       ( cat $$t | \
-                               grep -v ': In function' | \
-                               grep -v 'your code still has assertions enabled' | \
-                               grep -v ' is obsoleted' | \
-                               grep -v 'warning: #warning'; \
-                               rm -f $$t || : )
-
-
-linuxvirtual.h:
-if ENSC_ENABLE_INTERNAL_HEADERS
-                       ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
-else
-                       ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \
-                       ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
-endif
+                       @t=$$($(MKTEMP) -d /tmp/build.XXXXXX) && \
+                       trap "rm -rf $$t" EXIT && \
+                       mkfifo $$t/fifo && \
+                       ( grep --line-buffered -v \
+                                    -e ': In function' \
+                                    -e 'your code still has assertions enabled' \
+                                    -e ' is obsoleted' \
+                                    -e 'warning: #warning' <$$t/fifo & ) && \
+                       exec 2>$$t/fifo && \
+                       $(MAKE) '$*' -s >/dev/null
 
 pathsubst_RULES =      s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                        s!@'LEGACYDIR'@!$(legacydir)!g; \
@@ -151,6 +120,7 @@ pathsubst_RULES =   s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                        s!@'CONFDIR'@!$(confdir)!g; \
                        s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
                        s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \
+                       s!@'PKGCACHEDIR'@!$(pkgcachedir)!g; \
                        s!@'PKGSTATEREVDIR'@!$(pkgstaterevdir)!g; \
                        s!@'VSERVERDIR'@!$(vserverdir)!g; \
                        s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
@@ -187,6 +157,7 @@ pathconfig.h:               .pathconfig.h.pathsubst.stamp
                        @chmod a-w '$*'
                        @touch '$@'
 
+pkgcachedir =          $(localstatedir)/cache/vservers
 pkgstatedir =          $(localstatedir)/run/vservers
 pkgstaterevdir =       $(confdefaultsdir)/run.rev
 vserverpkgdir =                $(vserverdir)/.pkg
@@ -203,10 +174,12 @@ update-doc:               doc
 install-data-hook:     install-fix-script-paths install-create-dirs
 
 install-create-dirs:
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstatedir).rev $(DESTDIR)$(vshelperstatedir)
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir)
-                       f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)'      "$$f"
-                       f=$(DESTDIR)$(pkgstaterevdir);           test -e "$$f" || ln -sf '$(pkgstatedir).rev' "$$f"
+                       $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstatedir).rev $(DESTDIR)$(vshelperstatedir)
+                       $(mkinstalldirs) -m 0700 $(DESTDIR)$(pkgcachedir)
+                       $(mkinstalldirs) -m 0755 $(DESTDIR)$(confdefaultsdir)
+                       f=$(DESTDIR)$(confdefaultsdir)/vdirbase;  test -e "$$f" || ln -sf '$(vserverdir)'      "$$f"
+                       f=$(DESTDIR)$(confdefaultsdir)/cachebase; test -e "$$f" || ln -sf '$(pkgcachedir)'     "$$f"
+                       f=$(DESTDIR)$(pkgstaterevdir);            test -e "$$f" || ln -sf '$(pkgstatedir).rev' "$$f"
 
 install-fix-script-paths:
                        test "/usr/lib/util-vserver" = "$(pkglibdir)" || \
index d3531ac..4e0c960 100644 (file)
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+# Copyright (C) 2003,2004,2005,2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 
 
 
-SOURCES = $(nodist_lib_dietlibc_not_enabled_error_a_SOURCES) $(nodist_lib_glibc_not_enabled_error_a_SOURCES) $(lib_libvserver_a_SOURCES) $(lib_internal_libinternal_diet_a_SOURCES) $(lib_internal_libinternal_glibc_a_SOURCES) $(libensc_vector_diet_a_SOURCES) $(libensc_vector_glibc_a_SOURCES) $(lib_libvserver_la_SOURCES) $(src_rpm_fake_la_SOURCES) $(ensc_vector_testsuite_test1_SOURCES) $(ensc_vector_testsuite_test2_SOURCES) $(lib_testsuite_cflags_SOURCES) $(lib_testsuite_fmt_SOURCES) $(lib_testsuite_parselimit_SOURCES) $(lib_testsuite_personality_SOURCES) $(lib_internal_testsuite_command_SOURCES) $(lib_internal_testsuite_copy_SOURCES) $(lib_internal_testsuite_filecfg_ml_SOURCES) $(lib_internal_testsuite_sigbus_SOURCES) $(src_capchroot_SOURCES) $(src_chain_echo_SOURCES) $(src_chbind_SOURCES) $(src_chcontext_compat_SOURCES) src/check-unixfile.c $(src_chroot_sh_SOURCES) $(src_chxid_SOURCES) $(src_exec_cd_SOURCES) $(src_exec_ulimit_SOURCES) $(src_fakerunlevel_SOURCES) $(src_filetime_SOURCES) $(src_ifspec_SOURCES) $(src_keep_ctx_alive_SOURCES) $(src_listdevip_SOURCES) $(src_lockfile_SOURCES) $(src_lsxid_SOURCES) $(src_mask2prefix_SOURCES) $(src_parserpmdump_SOURCES) $(src_readlink_SOURCES) $(src_rebootmgr_SOURCES) $(src_reducecap_SOURCES) $(src_rpm_fake_resolver_SOURCES) $(src_save_ctxinfo_SOURCES) $(src_secure_mount_SOURCES) $(src_setattr_SOURCES) $(src_showattr_SOURCES) src/showperm.c src/sigexec.c $(src_testsuite_chbind_test_SOURCES) $(src_testsuite_chcontext_test_SOURCES) $(src_testsuite_rpm_fake_test_SOURCES) $(src_testsuite_vunify_functest_SOURCES) $(src_vattribute_SOURCES) $(src_vbuild_SOURCES) $(src_vcontext_SOURCES) $(src_vcopy_SOURCES) $(src_vdlimit_SOURCES) $(src_vdu_SOURCES) $(src_vhashify_SOURCES) $(src_vkill_SOURCES) $(src_vlimit_SOURCES) $(src_vnamespace_SOURCES) $(src_vps_SOURCES) $(src_vreboot_SOURCES) src/vrsetup.c $(src_vsched_SOURCES) $(src_vserver_info_SOURCES) $(src_vserver_stat_SOURCES) $(src_vsh_SOURCES) $(src_vshelper_sync_SOURCES) $(src_vuname_SOURCES) $(src_vunify_SOURCES) $(src_vwait_SOURCES) $(tests_escaperoot_SOURCES) $(tests_forkbomb_SOURCES) $(tests_getctx_SOURCES) $(tests_getinitpid_SOURCES) $(tests_testipc_SOURCES) $(tests_testlimit_SOURCES) $(tests_testopenf_SOURCES) $(tests_vserver_info_SOURCES) $(vserver_start_vserver_start_bin_SOURCES)
+SOURCES = $(nodist_lib_dietlibc_not_enabled_error_a_SOURCES) $(nodist_lib_glibc_not_enabled_error_a_SOURCES) $(lib_libvserver_a_SOURCES) $(lib_internal_libinternal_diet_a_SOURCES) $(lib_internal_libinternal_glibc_a_SOURCES) $(libensc_vector_diet_a_SOURCES) $(libensc_vector_glibc_a_SOURCES) $(lib_libvserver_la_SOURCES) $(src_rpm_fake_la_SOURCES) $(ensc_vector_testsuite_test1_SOURCES) $(ensc_vector_testsuite_test2_SOURCES) $(lib_testsuite_cflags_SOURCES) $(lib_testsuite_fmt_SOURCES) $(lib_testsuite_parselimit_SOURCES) $(lib_testsuite_personality_SOURCES) $(lib_internal_testsuite_command_SOURCES) $(lib_internal_testsuite_copy_SOURCES) $(lib_internal_testsuite_filecfg_ml_SOURCES) $(lib_internal_testsuite_isnumber_SOURCES) $(lib_internal_testsuite_isnumber_gnu_SOURCES) $(lib_internal_testsuite_sigbus_SOURCES) $(lib_internal_testsuite_sigbus_gnu_SOURCES) $(src_capchroot_SOURCES) $(src_chain_echo_SOURCES) $(src_chbind_compat_SOURCES) $(src_chcontext_compat_SOURCES) src/check-unixfile.c $(src_chroot_sh_SOURCES) $(src_chxid_SOURCES) $(src_exec_cd_SOURCES) $(src_exec_ulimit_SOURCES) $(src_fakerunlevel_SOURCES) $(src_filetime_SOURCES) $(src_ifspec_SOURCES) $(src_keep_ctx_alive_SOURCES) $(src_listdevip_SOURCES) $(src_lockfile_SOURCES) $(src_lsxid_SOURCES) $(src_mask2prefix_SOURCES) $(src_naddress_SOURCES) $(src_nattribute_SOURCES) $(src_ncontext_SOURCES) $(src_parserpmdump_SOURCES) $(src_readlink_SOURCES) $(src_rebootmgr_SOURCES) $(src_reducecap_SOURCES) $(src_rpm_fake_resolver_SOURCES) $(src_save_ctxinfo_SOURCES) $(src_secure_mount_SOURCES) $(src_setattr_SOURCES) $(src_showattr_SOURCES) src/showperm.c src/sigexec.c $(src_testsuite_chbind_test_SOURCES) $(src_testsuite_chcontext_test_SOURCES) $(src_testsuite_hashcalc_SOURCES) $(src_testsuite_hashcalc_plain_SOURCES) $(src_testsuite_rpm_fake_test_SOURCES) $(src_testsuite_vunify_functest_SOURCES) $(src_vattribute_SOURCES) $(src_vbuild_SOURCES) $(src_vcontext_SOURCES) $(src_vcopy_SOURCES) $(src_vdlimit_SOURCES) $(src_vdu_SOURCES) $(src_vhashify_SOURCES) $(src_vkill_SOURCES) $(src_vlimit_SOURCES) $(src_vnamespace_SOURCES) $(src_vps_SOURCES) $(src_vreboot_SOURCES) src/vrsetup.c $(src_vsched_SOURCES) $(src_vserver_info_SOURCES) $(src_vserver_stat_SOURCES) $(src_vsh_SOURCES) $(src_vshelper_sync_SOURCES) $(src_vuname_SOURCES) $(src_vunify_SOURCES) $(src_vwait_SOURCES) $(tests_escaperoot_SOURCES) $(tests_forkbomb_SOURCES) $(tests_getctx_SOURCES) $(tests_getinitpid_SOURCES) $(tests_testipc_SOURCES) $(tests_testlimit_SOURCES) $(tests_testopenf_SOURCES) $(tests_vserver_info_SOURCES) $(vserver_start_vserver_start_bin_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -67,31 +67,32 @@ pkglib_PROGRAMS = src/capchroot$(EXEEXT) src/chain-echo$(EXEEXT) \
        src/save_ctxinfo$(EXEEXT) src/secure-mount$(EXEEXT) \
        src/mask2prefix$(EXEEXT) src/exec-ulimit$(EXEEXT) \
        src/rpm-fake-resolver$(EXEEXT) src/vshelper-sync$(EXEEXT) \
-       src/sigexec$(EXEEXT) $(am__EXEEXT_8) $(am__EXEEXT_9) \
-       $(am__EXEEXT_10) $(am__EXEEXT_11)
+       src/sigexec$(EXEEXT) src/chbind-compat$(EXEEXT) \
+       $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
+       $(am__EXEEXT_12)
 legacy_PROGRAMS = src/ifspec$(EXEEXT) src/listdevip$(EXEEXT) \
        src/parserpmdump$(EXEEXT) src/rebootmgr$(EXEEXT) \
        src/showperm$(EXEEXT) src/vreboot$(EXEEXT)
-sbin_PROGRAMS = src/chbind$(EXEEXT) src/exec-cd$(EXEEXT) \
-       src/lsxid$(EXEEXT) src/chxid$(EXEEXT) src/vps$(EXEEXT) \
-       src/showattr$(EXEEXT) src/setattr$(EXEEXT) \
-       src/reducecap$(EXEEXT) src/vdu$(EXEEXT) \
+sbin_PROGRAMS = src/exec-cd$(EXEEXT) src/lsxid$(EXEEXT) \
+       src/chxid$(EXEEXT) src/vps$(EXEEXT) src/showattr$(EXEEXT) \
+       src/setattr$(EXEEXT) src/reducecap$(EXEEXT) src/vdu$(EXEEXT) \
        src/vattribute$(EXEEXT) src/vcontext$(EXEEXT) \
        src/vlimit$(EXEEXT) src/vkill$(EXEEXT) src/vnamespace$(EXEEXT) \
        src/vrsetup$(EXEEXT) src/vsched$(EXEEXT) \
        src/vserver-stat$(EXEEXT) src/vserver-info$(EXEEXT) \
        src/vuname$(EXEEXT) src/vsh$(EXEEXT) src/vwait$(EXEEXT) \
-       $(am__EXEEXT_12) $(am__EXEEXT_13)
+       src/ncontext$(EXEEXT) src/nattribute$(EXEEXT) \
+       src/naddress$(EXEEXT) $(am__EXEEXT_13) $(am__EXEEXT_14)
 noinst_PROGRAMS = tests/escaperoot$(EXEEXT) tests/forkbomb$(EXEEXT) \
        tests/testipc$(EXEEXT) tests/testlimit$(EXEEXT) \
-       tests/testopenf$(EXEEXT) $(am__EXEEXT_6)
+       tests/testopenf$(EXEEXT) $(am__EXEEXT_7)
 EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
 check_PROGRAMS = lib/testsuite/cflags$(EXEEXT) \
        lib/testsuite/personality$(EXEEXT) lib/testsuite/fmt$(EXEEXT) \
-       lib/testsuite/parselimit$(EXEEXT) $(am__EXEEXT_3) \
-       $(am__EXEEXT_4) ensc_vector/testsuite/test1$(EXEEXT) \
+       lib/testsuite/parselimit$(EXEEXT) $(am__EXEEXT_4) \
+       $(am__EXEEXT_5) ensc_vector/testsuite/test1$(EXEEXT) \
        ensc_vector/testsuite/test2$(EXEEXT) \
-       lib_internal/testsuite/command$(EXEEXT) $(am__EXEEXT_5)
+       lib_internal/testsuite/command$(EXEEXT) $(am__EXEEXT_6)
 DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
        $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(srcdir)/config.h.in \
@@ -133,21 +134,33 @@ DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
 @ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@am__append_3 = src/vhashify
 @ENSC_HAVE_BEECRYPT_TRUE@@ENSC_HAVE_C99_COMPILER_TRUE@am__append_4 = src/vhashify
 @ENSC_HAVE_C99_COMPILER_TRUE@am__append_5 = src/vdlimit
-@HAVE_XSLTP_TRUE@am__append_6 = $(doc_gen_DOCS)
-@HAVE_XSLTPROC_TRUE@@HAVE_XSLTP_FALSE@am__append_7 = $(doc_gen_DOCS)
-@ENSC_USE_GLIBC_TRUE@am__append_8 = $(LIBENSCVECTOR_GLIBC)
-@ENSC_USE_DIETLIBC_TRUE@am__append_9 = $(LIBENSCVECTOR_DIET)
-@USE_DIETLIBC_TRUE@am__append_10 = $(LIBINTERNAL_DIET)
-@ENSC_HAVE_C99_COMPILER_TRUE@am__append_11 = lib_internal/testsuite/filecfg-ml \
+@ENSC_HAVE_BEECRYPT_TRUE@@ENSC_HAVE_C99_COMPILER_TRUE@am__append_6 = src/testsuite/hashcalc            \
+@ENSC_HAVE_BEECRYPT_TRUE@@ENSC_HAVE_C99_COMPILER_TRUE@                                 src/testsuite/hashcalc-plain
+
+@ENSC_HAVE_BEECRYPT_TRUE@@ENSC_HAVE_C99_COMPILER_TRUE@am__append_7 = src/testsuite/hashcalc-plain.sh           \
+@ENSC_HAVE_BEECRYPT_TRUE@@ENSC_HAVE_C99_COMPILER_TRUE@                                 src/testsuite/hashcalc.sh
+
+@HAVE_XSLTP_TRUE@am__append_8 = $(doc_gen_DOCS)
+@HAVE_XSLTPROC_TRUE@@HAVE_XSLTP_FALSE@am__append_9 = $(doc_gen_DOCS)
+@ENSC_USE_GLIBC_TRUE@am__append_10 = $(LIBENSCVECTOR_GLIBC)
+@ENSC_USE_DIETLIBC_TRUE@am__append_11 = $(LIBENSCVECTOR_DIET)
+@USE_DIETLIBC_TRUE@am__append_12 = $(LIBINTERNAL_DIET)
+@ENSC_HAVE_C99_COMPILER_TRUE@am__append_13 = lib_internal/testsuite/filecfg-ml \
 @ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/copy \
-@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/sigbus
+@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/isnumber \
+@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/isnumber-gnu \
+@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/sigbus \
+@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/sigbus-gnu
 
-@ENSC_HAVE_C99_COMPILER_TRUE@am__append_12 = lib_internal/testsuite/filecfg-ml \
+@ENSC_HAVE_C99_COMPILER_TRUE@am__append_14 = lib_internal/testsuite/filecfg-ml \
 @ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/copy-check \
-@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/sigbus
+@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/isnumber \
+@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/isnumber-gnu \
+@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/sigbus \
+@ENSC_HAVE_C99_COMPILER_TRUE@                          lib_internal/testsuite/sigbus-gnu
 
-@ENSC_HAVE_C99_COMPILER_TRUE@am__append_13 = vserver-start/vserver.start.bin
-@ENSC_HAVE_C99_COMPILER_TRUE@am__append_14 = vserver-start/vserver.start.bin
+@ENSC_HAVE_C99_COMPILER_TRUE@am__append_15 = vserver-start/vserver.start.bin
+@ENSC_HAVE_C99_COMPILER_TRUE@am__append_16 = vserver-start/vserver.start.bin
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ensc_cflags.m4 \
@@ -157,7 +170,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ensc_cflags.m4 \
        $(top_srcdir)/m4/ensc_dietlibc_compat.m4 \
        $(top_srcdir)/m4/ensc_e2fscheck.m4 \
        $(top_srcdir)/m4/ensc_initrddir.m4 \
-       $(top_srcdir)/m4/ensc_kerneldir.m4 \
        $(top_srcdir)/m4/ensc_pathprog.m4 \
        $(top_srcdir)/m4/ensc_personality.m4 \
        $(top_srcdir)/m4/ensc_release.m4 \
@@ -191,7 +203,7 @@ lib_glibc_not_enabled_error_a_OBJECTS =  \
 lib_libvserver_a_AR = $(AR) $(ARFLAGS)
 lib_libvserver_a_LIBADD =
 am__lib_libvserver_a_SOURCES_DIST = lib/syscall.c lib/checkversion.c \
-       lib/isdirectory.c lib/isfile.c lib/islink.c \
+       lib/checkconfig.c lib/isdirectory.c lib/isfile.c lib/islink.c \
        lib/getnbipv4root.c lib/getversion.c lib/capabilities.c \
        lib/getfilecontext.c lib/getinsecurebcaps.c lib/getxidtype.c \
        lib/isdynamicxid.c lib/issupported.c lib/issupportedstring.c \
@@ -202,15 +214,16 @@ am__lib_libvserver_a_SOURCES_DIST = lib/syscall.c lib/checkversion.c \
        lib/val2text-v2t-uint32.c lib/val2text-v2t-uint64.c \
        lib/parselimit.c lib/planetlab.c lib/getprocentry-legacy.c \
        lib/cflags-compat.c lib/cflags_list-compat.c \
-       lib/createskeleton.c lib/getvserverbyctx.c \
-       lib/getvserverbyctx-compat.hc lib/getvserverbyctx-v13.hc \
-       lib/getvservercfgstyle.c lib/getvserverappdir.c \
-       lib/getvservercfgdir.c lib/getvserverctx.c \
-       lib/getvservername.c lib/getvservervdir.c lib/xidopt2xid.c \
-       lib/syscall_rlimit.c lib/syscall_rlimit-v11.hc \
-       lib/syscall_kill.c lib/syscall_kill-v11.hc \
-       lib/syscall_ctxcreate.c lib/syscall_ctxcreate-v13.hc \
-       lib/syscall_ctxmigrate.c lib/syscall_ctxmigrate-v13.hc \
+       lib/comparevserverbyid.c lib/createskeleton.c \
+       lib/getvserverbyctx.c lib/getvserverbyctx-compat.hc \
+       lib/getvserverbyctx-v13.hc lib/getvservercfgstyle.c \
+       lib/getvserverappdir.c lib/getvservercfgdir.c \
+       lib/getvserverctx.c lib/getvservername.c lib/getvservervdir.c \
+       lib/xidopt2xid.c lib/nidopt2nid.c lib/syscall_rlimit.c \
+       lib/syscall_rlimit-v11.hc lib/syscall_kill.c \
+       lib/syscall_kill-v11.hc lib/syscall_ctxcreate.c \
+       lib/syscall_ctxcreate-v13.hc lib/syscall_ctxmigrate.c \
+       lib/syscall_ctxmigrate-v13.hc \
        lib/syscall_cleanupnamespace-v13.hc \
        lib/syscall_cleanupnamespace.c \
        lib/syscall_enternamespace-v13.hc lib/syscall_enternamespace.c \
@@ -237,25 +250,35 @@ am__lib_libvserver_a_SOURCES_DIST = lib/syscall.c lib/checkversion.c \
        lib/syscall_setnamespace.c lib/syscall_setncaps-net.hc \
        lib/syscall_setncaps.c lib/syscall_setnflags-net.hc \
        lib/syscall_setnflags.c lib/syscall_setsched-v13.hc \
-       lib/syscall_setsched.c lib/syscall_setvhiname-olduts.hc \
-       lib/syscall_setvhiname-v13.hc lib/syscall_setvhiname.c \
-       lib/syscall_waitexit.c lib/syscall_waitexit-v13.hc \
-       lib/bcaps-v13.c lib/bcaps_list-v13.c lib/ccaps-v13.c \
-       lib/ccaps_list-v13.c lib/cflags-v13.c lib/cflags_list-v13.c \
-       lib/ncaps-net.c lib/ncaps_list-net.c lib/nflags-net.c \
-       lib/nflags_list-net.c lib/syscall_adddlimit-v13.hc \
-       lib/syscall_adddlimit.c lib/syscall_getdlimit-v13.hc \
-       lib/syscall_getdlimit.c lib/syscall_remdlimit-v13.hc \
-       lib/syscall_remdlimit.c lib/syscall_setdlimit-v13.hc \
-       lib/syscall_setdlimit.c ensc_fmt/fmt-32.c ensc_fmt/fmt-64.c \
-       ensc_fmt/fmtx-32.c ensc_fmt/fmtx-64.c ensc_fmt/fmt-tai64n.c \
-       ensc_fmt/fmt.h ensc_fmt/fmt.hc ensc_fmt/fmtx.hc \
-       ensc_fmt/fmt-internal.h
+       lib/syscall_setsched-v13obs.hc lib/syscall_setsched.c \
+       lib/syscall_setvhiname-olduts.hc lib/syscall_setvhiname-v13.hc \
+       lib/syscall_setvhiname.c lib/syscall_waitexit.c \
+       lib/syscall_waitexit-v13.hc lib/bcaps-v13.c \
+       lib/bcaps_list-v13.c lib/ccaps-v13.c lib/ccaps_list-v13.c \
+       lib/cflags-v13.c lib/cflags_list-v13.c lib/ncaps-net.c \
+       lib/ncaps_list-net.c lib/nflags-net.c lib/nflags_list-net.c \
+       lib/syscall_adddlimit-v13.hc lib/syscall_adddlimit.c \
+       lib/syscall_getdlimit-v13.hc lib/syscall_getdlimit.c \
+       lib/syscall_remdlimit-v13.hc lib/syscall_remdlimit.c \
+       lib/syscall_setdlimit-v13.hc lib/syscall_setdlimit.c \
+       lib/syscall_setccaps-v21.hc lib/syscall_setsched-v21.hc \
+       lib/syscall_rlimitstat.c lib/syscall_rlimitstat-v21.hc \
+       lib/syscall_resetminmax.c lib/syscall_resetminmax-v21.hc \
+       lib/syscall_getvci.c lib/syscall_getvci-v21.hc \
+       lib/syscall_virtstat.c lib/syscall_virtstat-v21.hc \
+       lib/syscall_ctxstat.c lib/syscall_ctxstat-v21.hc \
+       lib/syscall_getspacemask.c lib/syscall_getspacemask-v21.hc \
+       lib/syscall_enternamespace-v21.hc \
+       lib/syscall_setnamespace-v21.hc lib/syscall_ctxmigrate-v21.hc \
+       ensc_fmt/fmt-32.c ensc_fmt/fmt-64.c ensc_fmt/fmtx-32.c \
+       ensc_fmt/fmtx-64.c ensc_fmt/fmt-tai64n.c ensc_fmt/fmt.h \
+       ensc_fmt/fmt.hc ensc_fmt/fmtx.hc ensc_fmt/fmt-internal.h
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = lib/lib_libvserver_a-getprocentry-legacy.$(OBJEXT)
 am__objects_2 = lib/lib_libvserver_a-cflags-compat.$(OBJEXT) \
        lib/lib_libvserver_a-cflags_list-compat.$(OBJEXT)
-am__objects_3 = lib/lib_libvserver_a-createskeleton.$(OBJEXT) \
+am__objects_3 = lib/lib_libvserver_a-comparevserverbyid.$(OBJEXT) \
+       lib/lib_libvserver_a-createskeleton.$(OBJEXT) \
        lib/lib_libvserver_a-getvserverbyctx.$(OBJEXT) \
        lib/lib_libvserver_a-getvservercfgstyle.$(OBJEXT) \
        lib/lib_libvserver_a-getvserverappdir.$(OBJEXT) \
@@ -263,7 +286,8 @@ am__objects_3 = lib/lib_libvserver_a-createskeleton.$(OBJEXT) \
        lib/lib_libvserver_a-getvserverctx.$(OBJEXT) \
        lib/lib_libvserver_a-getvservername.$(OBJEXT) \
        lib/lib_libvserver_a-getvservervdir.$(OBJEXT) \
-       lib/lib_libvserver_a-xidopt2xid.$(OBJEXT)
+       lib/lib_libvserver_a-xidopt2xid.$(OBJEXT) \
+       lib/lib_libvserver_a-nidopt2nid.$(OBJEXT)
 am__objects_4 = lib/lib_libvserver_a-syscall_rlimit.$(OBJEXT) \
        lib/lib_libvserver_a-syscall_kill.$(OBJEXT)
 @ENSC_HAVE_C99_COMPILER_TRUE@am__objects_5 = lib/lib_libvserver_a-syscall_adddlimit.$(OBJEXT) \
@@ -308,13 +332,20 @@ am__objects_6 = lib/lib_libvserver_a-syscall_ctxcreate.$(OBJEXT) \
        lib/lib_libvserver_a-nflags-net.$(OBJEXT) \
        lib/lib_libvserver_a-nflags_list-net.$(OBJEXT) \
        $(am__objects_5)
-am__objects_7 = ensc_fmt/lib_libvserver_a-fmt-32.$(OBJEXT) \
+am__objects_7 = lib/lib_libvserver_a-syscall_rlimitstat.$(OBJEXT) \
+       lib/lib_libvserver_a-syscall_resetminmax.$(OBJEXT) \
+       lib/lib_libvserver_a-syscall_getvci.$(OBJEXT) \
+       lib/lib_libvserver_a-syscall_virtstat.$(OBJEXT) \
+       lib/lib_libvserver_a-syscall_ctxstat.$(OBJEXT) \
+       lib/lib_libvserver_a-syscall_getspacemask.$(OBJEXT)
+am__objects_8 = ensc_fmt/lib_libvserver_a-fmt-32.$(OBJEXT) \
        ensc_fmt/lib_libvserver_a-fmt-64.$(OBJEXT) \
        ensc_fmt/lib_libvserver_a-fmtx-32.$(OBJEXT) \
        ensc_fmt/lib_libvserver_a-fmtx-64.$(OBJEXT) \
        ensc_fmt/lib_libvserver_a-fmt-tai64n.$(OBJEXT)
-am__objects_8 = lib/lib_libvserver_a-syscall.$(OBJEXT) \
+am__objects_9 = lib/lib_libvserver_a-syscall.$(OBJEXT) \
        lib/lib_libvserver_a-checkversion.$(OBJEXT) \
+       lib/lib_libvserver_a-checkconfig.$(OBJEXT) \
        lib/lib_libvserver_a-isdirectory.$(OBJEXT) \
        lib/lib_libvserver_a-isfile.$(OBJEXT) \
        lib/lib_libvserver_a-islink.$(OBJEXT) \
@@ -340,8 +371,8 @@ am__objects_8 = lib/lib_libvserver_a-syscall.$(OBJEXT) \
        lib/lib_libvserver_a-parselimit.$(OBJEXT) \
        lib/lib_libvserver_a-planetlab.$(OBJEXT) $(am__objects_1) \
        $(am__objects_2) $(am__objects_3) $(am__objects_4) \
-       $(am__objects_6) $(am__objects_7)
-am_lib_libvserver_a_OBJECTS = $(am__objects_8)
+       $(am__objects_6) $(am__objects_7) $(am__objects_8)
+am_lib_libvserver_a_OBJECTS = $(am__objects_9)
 lib_libvserver_a_OBJECTS = $(am_lib_libvserver_a_OBJECTS)
 lib_internal_libinternal_diet_a_AR = $(AR) $(ARFLAGS)
 lib_internal_libinternal_diet_a_LIBADD =
@@ -361,8 +392,9 @@ am__lib_internal_libinternal_diet_a_SOURCES_DIST =  \
        lib_internal/unify-isiunlinkable.c \
        lib_internal/util-canonify.c \
        lib_internal/util-exitlikeprocess.c \
-       lib_internal/util-isnumber.c lib_internal/util-lockfile.c \
-       lib_internal/util-safechdir.c \
+       lib_internal/util-isnumber.hc lib_internal/util-isnumber.c \
+       lib_internal/util-isnumberunsigned.c \
+       lib_internal/util-lockfile.c lib_internal/util-safechdir.c \
        lib_internal/command-appendparameter.c \
        lib_internal/command-setparams.c lib_internal/command-exec.c \
        lib_internal/command-free.c lib_internal/command-init.c \
@@ -373,20 +405,20 @@ am__lib_internal_libinternal_diet_a_SOURCES_DIST =  \
        lib_internal/filecfg-readentrystr.c \
        lib_internal/matchlist-initbyvserver.c \
        lib_internal/matchvserverinfo-init.c lib_internal/unify-copy.c
-am__objects_9 = lib_internal/lib_internal_libinternal_diet_a-command-appendparameter.$(OBJEXT) \
+am__objects_10 = lib_internal/lib_internal_libinternal_diet_a-command-appendparameter.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-command-setparams.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-command-exec.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-command-free.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-command-init.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-command-reset.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-command-wait.$(OBJEXT)
-@ENSC_HAVE_C99_COMPILER_TRUE@am__objects_10 = lib_internal/lib_internal_libinternal_diet_a-filecfg-iteratemultiline.$(OBJEXT) \
+@ENSC_HAVE_C99_COMPILER_TRUE@am__objects_11 = lib_internal/lib_internal_libinternal_diet_a-filecfg-iteratemultiline.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_diet_a-filecfg-readentryflag.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_diet_a-filecfg-readentrystr.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_diet_a-matchlist-initbyvserver.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_diet_a-matchvserverinfo-init.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_diet_a-unify-copy.$(OBJEXT)
-am__objects_11 = lib_internal/lib_internal_libinternal_diet_a-errinfo-writeerrno.$(OBJEXT) \
+am__objects_12 = lib_internal/lib_internal_libinternal_diet_a-errinfo-writeerrno.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-jailintotempdir.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-matchlist-appendfiles.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-matchlist-compare.$(OBJEXT) \
@@ -406,10 +438,11 @@ am__objects_11 = lib_internal/lib_internal_libinternal_diet_a-errinfo-writeerrno
        lib_internal/lib_internal_libinternal_diet_a-util-canonify.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-util-exitlikeprocess.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-util-isnumber.$(OBJEXT) \
+       lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-util-lockfile.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_diet_a-util-safechdir.$(OBJEXT) \
-       $(am__objects_9) $(am__objects_10)
-am_lib_internal_libinternal_diet_a_OBJECTS = $(am__objects_11)
+       $(am__objects_10) $(am__objects_11)
+am_lib_internal_libinternal_diet_a_OBJECTS = $(am__objects_12)
 lib_internal_libinternal_diet_a_OBJECTS =  \
        $(am_lib_internal_libinternal_diet_a_OBJECTS)
 lib_internal_libinternal_glibc_a_AR = $(AR) $(ARFLAGS)
@@ -430,8 +463,9 @@ am__lib_internal_libinternal_glibc_a_SOURCES_DIST =  \
        lib_internal/unify-isiunlinkable.c \
        lib_internal/util-canonify.c \
        lib_internal/util-exitlikeprocess.c \
-       lib_internal/util-isnumber.c lib_internal/util-lockfile.c \
-       lib_internal/util-safechdir.c \
+       lib_internal/util-isnumber.hc lib_internal/util-isnumber.c \
+       lib_internal/util-isnumberunsigned.c \
+       lib_internal/util-lockfile.c lib_internal/util-safechdir.c \
        lib_internal/command-appendparameter.c \
        lib_internal/command-setparams.c lib_internal/command-exec.c \
        lib_internal/command-free.c lib_internal/command-init.c \
@@ -442,20 +476,20 @@ am__lib_internal_libinternal_glibc_a_SOURCES_DIST =  \
        lib_internal/filecfg-readentrystr.c \
        lib_internal/matchlist-initbyvserver.c \
        lib_internal/matchvserverinfo-init.c lib_internal/unify-copy.c
-am__objects_12 = lib_internal/lib_internal_libinternal_glibc_a-command-appendparameter.$(OBJEXT) \
+am__objects_13 = lib_internal/lib_internal_libinternal_glibc_a-command-appendparameter.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-command-setparams.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-command-exec.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-command-free.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-command-init.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-command-reset.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-command-wait.$(OBJEXT)
-@ENSC_HAVE_C99_COMPILER_TRUE@am__objects_13 = lib_internal/lib_internal_libinternal_glibc_a-filecfg-iteratemultiline.$(OBJEXT) \
+@ENSC_HAVE_C99_COMPILER_TRUE@am__objects_14 = lib_internal/lib_internal_libinternal_glibc_a-filecfg-iteratemultiline.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_glibc_a-filecfg-readentryflag.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_glibc_a-filecfg-readentrystr.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_glibc_a-matchlist-initbyvserver.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_glibc_a-matchvserverinfo-init.$(OBJEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/lib_internal_libinternal_glibc_a-unify-copy.$(OBJEXT)
-am__objects_14 = lib_internal/lib_internal_libinternal_glibc_a-errinfo-writeerrno.$(OBJEXT) \
+am__objects_15 = lib_internal/lib_internal_libinternal_glibc_a-errinfo-writeerrno.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-jailintotempdir.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-matchlist-appendfiles.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-matchlist-compare.$(OBJEXT) \
@@ -475,15 +509,16 @@ am__objects_14 = lib_internal/lib_internal_libinternal_glibc_a-errinfo-writeerrn
        lib_internal/lib_internal_libinternal_glibc_a-util-canonify.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-util-exitlikeprocess.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-util-isnumber.$(OBJEXT) \
+       lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-util-lockfile.$(OBJEXT) \
        lib_internal/lib_internal_libinternal_glibc_a-util-safechdir.$(OBJEXT) \
-       $(am__objects_12) $(am__objects_13)
-am_lib_internal_libinternal_glibc_a_OBJECTS = $(am__objects_14)
+       $(am__objects_13) $(am__objects_14)
+am_lib_internal_libinternal_glibc_a_OBJECTS = $(am__objects_15)
 lib_internal_libinternal_glibc_a_OBJECTS =  \
        $(am_lib_internal_libinternal_glibc_a_OBJECTS)
 libensc_vector_diet_a_AR = $(AR) $(ARFLAGS)
 libensc_vector_diet_a_LIBADD =
-am__objects_15 =  \
+am__objects_16 =  \
        ensc_vector/libensc_vector_diet_a-vector-clear.$(OBJEXT) \
        ensc_vector/libensc_vector_diet_a-vector-foreach.$(OBJEXT) \
        ensc_vector/libensc_vector_diet_a-vector-free.$(OBJEXT) \
@@ -504,11 +539,11 @@ am__objects_15 =  \
        ensc_vector/libensc_vector_diet_a-list-insertinternal.$(OBJEXT) \
        ensc_vector/libensc_vector_diet_a-list-search.$(OBJEXT) \
        ensc_vector/libensc_vector_diet_a-list-searchselforg.$(OBJEXT)
-am_libensc_vector_diet_a_OBJECTS = $(am__objects_15)
+am_libensc_vector_diet_a_OBJECTS = $(am__objects_16)
 libensc_vector_diet_a_OBJECTS = $(am_libensc_vector_diet_a_OBJECTS)
 libensc_vector_glibc_a_AR = $(AR) $(ARFLAGS)
 libensc_vector_glibc_a_LIBADD =
-am__objects_16 =  \
+am__objects_17 =  \
        ensc_vector/libensc_vector_glibc_a-vector-clear.$(OBJEXT) \
        ensc_vector/libensc_vector_glibc_a-vector-foreach.$(OBJEXT) \
        ensc_vector/libensc_vector_glibc_a-vector-free.$(OBJEXT) \
@@ -529,14 +564,14 @@ am__objects_16 =  \
        ensc_vector/libensc_vector_glibc_a-list-insertinternal.$(OBJEXT) \
        ensc_vector/libensc_vector_glibc_a-list-search.$(OBJEXT) \
        ensc_vector/libensc_vector_glibc_a-list-searchselforg.$(OBJEXT)
-am_libensc_vector_glibc_a_OBJECTS = $(am__objects_16)
+am_libensc_vector_glibc_a_OBJECTS = $(am__objects_17)
 libensc_vector_glibc_a_OBJECTS = $(am_libensc_vector_glibc_a_OBJECTS)
 libLTLIBRARIES_INSTALL = $(INSTALL)
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 lib_libvserver_la_LIBADD =
 am__lib_libvserver_la_SOURCES_DIST = lib/syscall.c lib/checkversion.c \
-       lib/isdirectory.c lib/isfile.c lib/islink.c \
+       lib/checkconfig.c lib/isdirectory.c lib/isfile.c lib/islink.c \
        lib/getnbipv4root.c lib/getversion.c lib/capabilities.c \
        lib/getfilecontext.c lib/getinsecurebcaps.c lib/getxidtype.c \
        lib/isdynamicxid.c lib/issupported.c lib/issupportedstring.c \
@@ -547,15 +582,16 @@ am__lib_libvserver_la_SOURCES_DIST = lib/syscall.c lib/checkversion.c \
        lib/val2text-v2t-uint32.c lib/val2text-v2t-uint64.c \
        lib/parselimit.c lib/planetlab.c lib/getprocentry-legacy.c \
        lib/cflags-compat.c lib/cflags_list-compat.c \
-       lib/createskeleton.c lib/getvserverbyctx.c \
-       lib/getvserverbyctx-compat.hc lib/getvserverbyctx-v13.hc \
-       lib/getvservercfgstyle.c lib/getvserverappdir.c \
-       lib/getvservercfgdir.c lib/getvserverctx.c \
-       lib/getvservername.c lib/getvservervdir.c lib/xidopt2xid.c \
-       lib/syscall_rlimit.c lib/syscall_rlimit-v11.hc \
-       lib/syscall_kill.c lib/syscall_kill-v11.hc \
-       lib/syscall_ctxcreate.c lib/syscall_ctxcreate-v13.hc \
-       lib/syscall_ctxmigrate.c lib/syscall_ctxmigrate-v13.hc \
+       lib/comparevserverbyid.c lib/createskeleton.c \
+       lib/getvserverbyctx.c lib/getvserverbyctx-compat.hc \
+       lib/getvserverbyctx-v13.hc lib/getvservercfgstyle.c \
+       lib/getvserverappdir.c lib/getvservercfgdir.c \
+       lib/getvserverctx.c lib/getvservername.c lib/getvservervdir.c \
+       lib/xidopt2xid.c lib/nidopt2nid.c lib/syscall_rlimit.c \
+       lib/syscall_rlimit-v11.hc lib/syscall_kill.c \
+       lib/syscall_kill-v11.hc lib/syscall_ctxcreate.c \
+       lib/syscall_ctxcreate-v13.hc lib/syscall_ctxmigrate.c \
+       lib/syscall_ctxmigrate-v13.hc \
        lib/syscall_cleanupnamespace-v13.hc \
        lib/syscall_cleanupnamespace.c \
        lib/syscall_enternamespace-v13.hc lib/syscall_enternamespace.c \
@@ -582,24 +618,34 @@ am__lib_libvserver_la_SOURCES_DIST = lib/syscall.c lib/checkversion.c \
        lib/syscall_setnamespace.c lib/syscall_setncaps-net.hc \
        lib/syscall_setncaps.c lib/syscall_setnflags-net.hc \
        lib/syscall_setnflags.c lib/syscall_setsched-v13.hc \
-       lib/syscall_setsched.c lib/syscall_setvhiname-olduts.hc \
-       lib/syscall_setvhiname-v13.hc lib/syscall_setvhiname.c \
-       lib/syscall_waitexit.c lib/syscall_waitexit-v13.hc \
-       lib/bcaps-v13.c lib/bcaps_list-v13.c lib/ccaps-v13.c \
-       lib/ccaps_list-v13.c lib/cflags-v13.c lib/cflags_list-v13.c \
-       lib/ncaps-net.c lib/ncaps_list-net.c lib/nflags-net.c \
-       lib/nflags_list-net.c lib/syscall_adddlimit-v13.hc \
-       lib/syscall_adddlimit.c lib/syscall_getdlimit-v13.hc \
-       lib/syscall_getdlimit.c lib/syscall_remdlimit-v13.hc \
-       lib/syscall_remdlimit.c lib/syscall_setdlimit-v13.hc \
-       lib/syscall_setdlimit.c ensc_fmt/fmt-32.c ensc_fmt/fmt-64.c \
-       ensc_fmt/fmtx-32.c ensc_fmt/fmtx-64.c ensc_fmt/fmt-tai64n.c \
-       ensc_fmt/fmt.h ensc_fmt/fmt.hc ensc_fmt/fmtx.hc \
-       ensc_fmt/fmt-internal.h
-am__objects_17 = lib/lib_libvserver_la-getprocentry-legacy.lo
-am__objects_18 = lib/lib_libvserver_la-cflags-compat.lo \
+       lib/syscall_setsched-v13obs.hc lib/syscall_setsched.c \
+       lib/syscall_setvhiname-olduts.hc lib/syscall_setvhiname-v13.hc \
+       lib/syscall_setvhiname.c lib/syscall_waitexit.c \
+       lib/syscall_waitexit-v13.hc lib/bcaps-v13.c \
+       lib/bcaps_list-v13.c lib/ccaps-v13.c lib/ccaps_list-v13.c \
+       lib/cflags-v13.c lib/cflags_list-v13.c lib/ncaps-net.c \
+       lib/ncaps_list-net.c lib/nflags-net.c lib/nflags_list-net.c \
+       lib/syscall_adddlimit-v13.hc lib/syscall_adddlimit.c \
+       lib/syscall_getdlimit-v13.hc lib/syscall_getdlimit.c \
+       lib/syscall_remdlimit-v13.hc lib/syscall_remdlimit.c \
+       lib/syscall_setdlimit-v13.hc lib/syscall_setdlimit.c \
+       lib/syscall_setccaps-v21.hc lib/syscall_setsched-v21.hc \
+       lib/syscall_rlimitstat.c lib/syscall_rlimitstat-v21.hc \
+       lib/syscall_resetminmax.c lib/syscall_resetminmax-v21.hc \
+       lib/syscall_getvci.c lib/syscall_getvci-v21.hc \
+       lib/syscall_virtstat.c lib/syscall_virtstat-v21.hc \
+       lib/syscall_ctxstat.c lib/syscall_ctxstat-v21.hc \
+       lib/syscall_getspacemask.c lib/syscall_getspacemask-v21.hc \
+       lib/syscall_enternamespace-v21.hc \
+       lib/syscall_setnamespace-v21.hc lib/syscall_ctxmigrate-v21.hc \
+       ensc_fmt/fmt-32.c ensc_fmt/fmt-64.c ensc_fmt/fmtx-32.c \
+       ensc_fmt/fmtx-64.c ensc_fmt/fmt-tai64n.c ensc_fmt/fmt.h \
+       ensc_fmt/fmt.hc ensc_fmt/fmtx.hc ensc_fmt/fmt-internal.h
+am__objects_18 = lib/lib_libvserver_la-getprocentry-legacy.lo
+am__objects_19 = lib/lib_libvserver_la-cflags-compat.lo \
        lib/lib_libvserver_la-cflags_list-compat.lo
-am__objects_19 = lib/lib_libvserver_la-createskeleton.lo \
+am__objects_20 = lib/lib_libvserver_la-comparevserverbyid.lo \
+       lib/lib_libvserver_la-createskeleton.lo \
        lib/lib_libvserver_la-getvserverbyctx.lo \
        lib/lib_libvserver_la-getvservercfgstyle.lo \
        lib/lib_libvserver_la-getvserverappdir.lo \
@@ -607,14 +653,15 @@ am__objects_19 = lib/lib_libvserver_la-createskeleton.lo \
        lib/lib_libvserver_la-getvserverctx.lo \
        lib/lib_libvserver_la-getvservername.lo \
        lib/lib_libvserver_la-getvservervdir.lo \
-       lib/lib_libvserver_la-xidopt2xid.lo
-am__objects_20 = lib/lib_libvserver_la-syscall_rlimit.lo \
+       lib/lib_libvserver_la-xidopt2xid.lo \
+       lib/lib_libvserver_la-nidopt2nid.lo
+am__objects_21 = lib/lib_libvserver_la-syscall_rlimit.lo \
        lib/lib_libvserver_la-syscall_kill.lo
-@ENSC_HAVE_C99_COMPILER_TRUE@am__objects_21 = lib/lib_libvserver_la-syscall_adddlimit.lo \
+@ENSC_HAVE_C99_COMPILER_TRUE@am__objects_22 = lib/lib_libvserver_la-syscall_adddlimit.lo \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib/lib_libvserver_la-syscall_getdlimit.lo \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib/lib_libvserver_la-syscall_remdlimit.lo \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib/lib_libvserver_la-syscall_setdlimit.lo
-am__objects_22 = lib/lib_libvserver_la-syscall_ctxcreate.lo \
+am__objects_23 = lib/lib_libvserver_la-syscall_ctxcreate.lo \
        lib/lib_libvserver_la-syscall_ctxmigrate.lo \
        lib/lib_libvserver_la-syscall_cleanupnamespace.lo \
        lib/lib_libvserver_la-syscall_enternamespace.lo \
@@ -650,14 +697,21 @@ am__objects_22 = lib/lib_libvserver_la-syscall_ctxcreate.lo \
        lib/lib_libvserver_la-ncaps-net.lo \
        lib/lib_libvserver_la-ncaps_list-net.lo \
        lib/lib_libvserver_la-nflags-net.lo \
-       lib/lib_libvserver_la-nflags_list-net.lo $(am__objects_21)
-am__objects_23 = ensc_fmt/lib_libvserver_la-fmt-32.lo \
+       lib/lib_libvserver_la-nflags_list-net.lo $(am__objects_22)
+am__objects_24 = lib/lib_libvserver_la-syscall_rlimitstat.lo \
+       lib/lib_libvserver_la-syscall_resetminmax.lo \
+       lib/lib_libvserver_la-syscall_getvci.lo \
+       lib/lib_libvserver_la-syscall_virtstat.lo \
+       lib/lib_libvserver_la-syscall_ctxstat.lo \
+       lib/lib_libvserver_la-syscall_getspacemask.lo
+am__objects_25 = ensc_fmt/lib_libvserver_la-fmt-32.lo \
        ensc_fmt/lib_libvserver_la-fmt-64.lo \
        ensc_fmt/lib_libvserver_la-fmtx-32.lo \
        ensc_fmt/lib_libvserver_la-fmtx-64.lo \
        ensc_fmt/lib_libvserver_la-fmt-tai64n.lo
-am__objects_24 = lib/lib_libvserver_la-syscall.lo \
+am__objects_26 = lib/lib_libvserver_la-syscall.lo \
        lib/lib_libvserver_la-checkversion.lo \
+       lib/lib_libvserver_la-checkconfig.lo \
        lib/lib_libvserver_la-isdirectory.lo \
        lib/lib_libvserver_la-isfile.lo \
        lib/lib_libvserver_la-islink.lo \
@@ -681,10 +735,10 @@ am__objects_24 = lib/lib_libvserver_la-syscall.lo \
        lib/lib_libvserver_la-val2text-v2t-uint32.lo \
        lib/lib_libvserver_la-val2text-v2t-uint64.lo \
        lib/lib_libvserver_la-parselimit.lo \
-       lib/lib_libvserver_la-planetlab.lo $(am__objects_17) \
-       $(am__objects_18) $(am__objects_19) $(am__objects_20) \
-       $(am__objects_22) $(am__objects_23)
-am_lib_libvserver_la_OBJECTS = $(am__objects_24)
+       lib/lib_libvserver_la-planetlab.lo $(am__objects_18) \
+       $(am__objects_19) $(am__objects_20) $(am__objects_21) \
+       $(am__objects_23) $(am__objects_24) $(am__objects_25)
+am_lib_libvserver_la_OBJECTS = $(am__objects_26)
 lib_libvserver_la_OBJECTS = $(am_lib_libvserver_la_OBJECTS)
 am__DEPENDENCIES_1 = lib/libvserver.la
 src_rpm_fake_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -692,24 +746,29 @@ am_src_rpm_fake_la_OBJECTS = src/src_rpm_fake_la-rpm-fake.lo
 src_rpm_fake_la_OBJECTS = $(am_src_rpm_fake_la_OBJECTS)
 am__EXEEXT_1 =
 am__EXEEXT_2 = src/vbuild$(EXEEXT)
-am__EXEEXT_3 = src/testsuite/rpm-fake-test$(EXEEXT)
-am__EXEEXT_4 = src/testsuite/vunify-functest$(EXEEXT) \
+@ENSC_HAVE_BEECRYPT_TRUE@@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_3 = src/testsuite/hashcalc$(EXEEXT) \
+@ENSC_HAVE_BEECRYPT_TRUE@@ENSC_HAVE_C99_COMPILER_TRUE@ src/testsuite/hashcalc-plain$(EXEEXT)
+am__EXEEXT_4 = src/testsuite/rpm-fake-test$(EXEEXT) $(am__EXEEXT_3)
+am__EXEEXT_5 = src/testsuite/vunify-functest$(EXEEXT) \
        src/testsuite/chcontext-test$(EXEEXT) \
        src/testsuite/chbind-test$(EXEEXT)
-@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_5 = lib_internal/testsuite/filecfg-ml$(EXEEXT) \
+@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_6 = lib_internal/testsuite/filecfg-ml$(EXEEXT) \
 @ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/testsuite/copy$(EXEEXT) \
-@ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/testsuite/sigbus$(EXEEXT)
+@ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/testsuite/isnumber$(EXEEXT) \
+@ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/testsuite/isnumber-gnu$(EXEEXT) \
+@ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/testsuite/sigbus$(EXEEXT) \
+@ENSC_HAVE_C99_COMPILER_TRUE@  lib_internal/testsuite/sigbus-gnu$(EXEEXT)
 legacyPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-am__EXEEXT_6 = tests/getctx$(EXEEXT) tests/getinitpid$(EXEEXT) \
+am__EXEEXT_7 = tests/getctx$(EXEEXT) tests/getinitpid$(EXEEXT) \
        tests/vserver-info$(EXEEXT)
-am__EXEEXT_7 = src/vunify$(EXEEXT) src/vcopy$(EXEEXT)
-@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_8 = $(am__EXEEXT_7)
-@ENSC_HAVE_CXX_COMPILER_TRUE@am__EXEEXT_9 = $(am__EXEEXT_2)
-@ENSC_HAVE_BEECRYPT_TRUE@@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_10 = src/vhashify$(EXEEXT)
-@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_11 = vserver-start/vserver.start.bin$(EXEEXT)
+am__EXEEXT_8 = src/vunify$(EXEEXT) src/vcopy$(EXEEXT)
+@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_9 = $(am__EXEEXT_8)
+@ENSC_HAVE_CXX_COMPILER_TRUE@am__EXEEXT_10 = $(am__EXEEXT_2)
+@ENSC_HAVE_BEECRYPT_TRUE@@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_11 = src/vhashify$(EXEEXT)
+@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_12 = vserver-start/vserver.start.bin$(EXEEXT)
 pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@ENSC_HAVE_CXX_COMPILER_TRUE@am__EXEEXT_12 = $(am__EXEEXT_1)
-@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_13 = src/vdlimit$(EXEEXT)
+@ENSC_HAVE_CXX_COMPILER_TRUE@am__EXEEXT_13 = $(am__EXEEXT_1)
+@ENSC_HAVE_C99_COMPILER_TRUE@am__EXEEXT_14 = src/vdlimit$(EXEEXT)
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(legacy_PROGRAMS) $(noinst_PROGRAMS) $(pkglib_PROGRAMS) \
        $(sbin_PROGRAMS)
@@ -773,41 +832,57 @@ lib_internal_testsuite_filecfg_ml_OBJECTS =  \
        $(am_lib_internal_testsuite_filecfg_ml_OBJECTS)
 lib_internal_testsuite_filecfg_ml_DEPENDENCIES =  \
        $(am__DEPENDENCIES_7)
+am_lib_internal_testsuite_isnumber_OBJECTS =  \
+       lib_internal/testsuite/isnumber.$(OBJEXT)
+lib_internal_testsuite_isnumber_OBJECTS =  \
+       $(am_lib_internal_testsuite_isnumber_OBJECTS)
+@USE_DIETLIBC_FALSE@am__DEPENDENCIES_8 =  \
+@USE_DIETLIBC_FALSE@   lib-dietlibc-not-enabled-error.a
+@USE_DIETLIBC_TRUE@am__DEPENDENCIES_8 =  \
+@USE_DIETLIBC_TRUE@    lib_internal/libinternal-diet.a
+@USE_DIETLIBC_FALSE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_7)
+@USE_DIETLIBC_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+lib_internal_testsuite_isnumber_DEPENDENCIES = $(am__DEPENDENCIES_9)
+am_lib_internal_testsuite_isnumber_gnu_OBJECTS =  \
+       lib_internal/testsuite/isnumber.$(OBJEXT)
+lib_internal_testsuite_isnumber_gnu_OBJECTS =  \
+       $(am_lib_internal_testsuite_isnumber_gnu_OBJECTS)
+lib_internal_testsuite_isnumber_gnu_DEPENDENCIES =  \
+       $(am__DEPENDENCIES_7)
 am_lib_internal_testsuite_sigbus_OBJECTS =  \
        lib_internal/testsuite/sigbus.$(OBJEXT)
 lib_internal_testsuite_sigbus_OBJECTS =  \
        $(am_lib_internal_testsuite_sigbus_OBJECTS)
 lib_internal_testsuite_sigbus_LDADD = $(LDADD)
+am_lib_internal_testsuite_sigbus_gnu_OBJECTS =  \
+       lib_internal/testsuite/sigbus.$(OBJEXT)
+lib_internal_testsuite_sigbus_gnu_OBJECTS =  \
+       $(am_lib_internal_testsuite_sigbus_gnu_OBJECTS)
+lib_internal_testsuite_sigbus_gnu_LDADD = $(LDADD)
 am_src_capchroot_OBJECTS = src/capchroot.$(OBJEXT)
 src_capchroot_OBJECTS = $(am_src_capchroot_OBJECTS)
-am__DEPENDENCIES_8 =
-am__DEPENDENCIES_9 = $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_8)
-src_capchroot_DEPENDENCIES = $(am__DEPENDENCIES_9)
+am__DEPENDENCIES_10 =
+am__DEPENDENCIES_11 = $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_10)
+src_capchroot_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_chain_echo_OBJECTS = src/chain-echo.$(OBJEXT)
 src_chain_echo_OBJECTS = $(am_src_chain_echo_OBJECTS)
 src_chain_echo_LDADD = $(LDADD)
-am_src_chbind_OBJECTS = src/chbind.$(OBJEXT)
-src_chbind_OBJECTS = $(am_src_chbind_OBJECTS)
-src_chbind_DEPENDENCIES = $(am__DEPENDENCIES_9)
+am_src_chbind_compat_OBJECTS = src/chbind.$(OBJEXT)
+src_chbind_compat_OBJECTS = $(am_src_chbind_compat_OBJECTS)
+src_chbind_compat_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_chcontext_compat_OBJECTS = src/chcontext.$(OBJEXT)
 src_chcontext_compat_OBJECTS = $(am_src_chcontext_compat_OBJECTS)
-@USE_DIETLIBC_FALSE@am__DEPENDENCIES_10 =  \
-@USE_DIETLIBC_FALSE@   lib-dietlibc-not-enabled-error.a
-@USE_DIETLIBC_TRUE@am__DEPENDENCIES_10 =  \
-@USE_DIETLIBC_TRUE@    lib_internal/libinternal-diet.a
-@USE_DIETLIBC_FALSE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_7)
-@USE_DIETLIBC_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_10)
-src_chcontext_compat_DEPENDENCIES = $(am__DEPENDENCIES_9) \
-       $(am__DEPENDENCIES_11)
+src_chcontext_compat_DEPENDENCIES = $(am__DEPENDENCIES_11) \
+       $(am__DEPENDENCIES_9)
 src_check_unixfile_SOURCES = src/check-unixfile.c
 src_check_unixfile_OBJECTS = src/check-unixfile.$(OBJEXT)
 src_check_unixfile_LDADD = $(LDADD)
 am_src_chroot_sh_OBJECTS = src/chroot-sh.$(OBJEXT)
 src_chroot_sh_OBJECTS = $(am_src_chroot_sh_OBJECTS)
-src_chroot_sh_LDADD = $(LDADD)
+src_chroot_sh_DEPENDENCIES = $(am__DEPENDENCIES_9)
 am_src_chxid_OBJECTS = src/fstool.$(OBJEXT) src/chxid.$(OBJEXT)
 src_chxid_OBJECTS = $(am_src_chxid_OBJECTS)
-src_chxid_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_9)
+src_chxid_DEPENDENCIES = $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_11)
 am_src_exec_cd_OBJECTS = src/exec-cd.$(OBJEXT)
 src_exec_cd_OBJECTS = $(am_src_exec_cd_OBJECTS)
 src_exec_cd_LDADD = $(LDADD)
@@ -819,13 +894,13 @@ src_fakerunlevel_OBJECTS = $(am_src_fakerunlevel_OBJECTS)
 src_fakerunlevel_LDADD = $(LDADD)
 am_src_filetime_OBJECTS = src/filetime.$(OBJEXT)
 src_filetime_OBJECTS = $(am_src_filetime_OBJECTS)
-src_filetime_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_filetime_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_ifspec_OBJECTS = src/ifspec.$(OBJEXT)
 src_ifspec_OBJECTS = $(am_src_ifspec_OBJECTS)
 src_ifspec_LDADD = $(LDADD)
 am_src_keep_ctx_alive_OBJECTS = src/keep-ctx-alive.$(OBJEXT)
 src_keep_ctx_alive_OBJECTS = $(am_src_keep_ctx_alive_OBJECTS)
-src_keep_ctx_alive_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_keep_ctx_alive_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_listdevip_OBJECTS = src/listdevip.$(OBJEXT)
 src_listdevip_OBJECTS = $(am_src_listdevip_OBJECTS)
 src_listdevip_LDADD = $(LDADD)
@@ -834,11 +909,22 @@ src_lockfile_OBJECTS = $(am_src_lockfile_OBJECTS)
 src_lockfile_LDADD = $(LDADD)
 am_src_lsxid_OBJECTS = src/fstool.$(OBJEXT) src/lsxid.$(OBJEXT)
 src_lsxid_OBJECTS = $(am_src_lsxid_OBJECTS)
-src_lsxid_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_9) \
+src_lsxid_DEPENDENCIES = $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_11) \
        $(am__DEPENDENCIES_4)
 am_src_mask2prefix_OBJECTS = src/mask2prefix.$(OBJEXT)
 src_mask2prefix_OBJECTS = $(am_src_mask2prefix_OBJECTS)
 src_mask2prefix_LDADD = $(LDADD)
+am_src_naddress_OBJECTS = src/naddress.$(OBJEXT)
+src_naddress_OBJECTS = $(am_src_naddress_OBJECTS)
+src_naddress_DEPENDENCIES = $(am__DEPENDENCIES_11) \
+       $(am__DEPENDENCIES_9)
+am_src_nattribute_OBJECTS = src/nattribute.$(OBJEXT)
+src_nattribute_OBJECTS = $(am_src_nattribute_OBJECTS)
+src_nattribute_DEPENDENCIES = $(am__DEPENDENCIES_11)
+am_src_ncontext_OBJECTS = src/ncontext.$(OBJEXT)
+src_ncontext_OBJECTS = $(am_src_ncontext_OBJECTS)
+src_ncontext_DEPENDENCIES = $(am__DEPENDENCIES_11) \
+       $(am__DEPENDENCIES_9)
 am_src_parserpmdump_OBJECTS = src/parserpmdump.$(OBJEXT)
 src_parserpmdump_OBJECTS = $(am_src_parserpmdump_OBJECTS)
 src_parserpmdump_LDADD = $(LDADD)
@@ -850,24 +936,24 @@ src_rebootmgr_OBJECTS = $(am_src_rebootmgr_OBJECTS)
 src_rebootmgr_LDADD = $(LDADD)
 am_src_reducecap_OBJECTS = src/reducecap.$(OBJEXT)
 src_reducecap_OBJECTS = $(am_src_reducecap_OBJECTS)
-src_reducecap_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_reducecap_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_rpm_fake_resolver_OBJECTS = src/rpm-fake-resolver.$(OBJEXT)
 src_rpm_fake_resolver_OBJECTS = $(am_src_rpm_fake_resolver_OBJECTS)
-src_rpm_fake_resolver_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_rpm_fake_resolver_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_save_ctxinfo_OBJECTS = src/save_ctxinfo.$(OBJEXT)
 src_save_ctxinfo_OBJECTS = $(am_src_save_ctxinfo_OBJECTS)
-src_save_ctxinfo_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_save_ctxinfo_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_secure_mount_OBJECTS = src/secure-mount.$(OBJEXT)
 src_secure_mount_OBJECTS = $(am_src_secure_mount_OBJECTS)
-src_secure_mount_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_secure_mount_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_setattr_OBJECTS = src/fstool.$(OBJEXT) src/setattr.$(OBJEXT)
 src_setattr_OBJECTS = $(am_src_setattr_OBJECTS)
-src_setattr_DEPENDENCIES = $(am__DEPENDENCIES_11) \
-       $(am__DEPENDENCIES_9)
+src_setattr_DEPENDENCIES = $(am__DEPENDENCIES_9) \
+       $(am__DEPENDENCIES_11)
 am_src_showattr_OBJECTS = src/fstool.$(OBJEXT) src/showattr.$(OBJEXT)
 src_showattr_OBJECTS = $(am_src_showattr_OBJECTS)
-src_showattr_DEPENDENCIES = $(am__DEPENDENCIES_11) \
-       $(am__DEPENDENCIES_9)
+src_showattr_DEPENDENCIES = $(am__DEPENDENCIES_9) \
+       $(am__DEPENDENCIES_11)
 src_showperm_SOURCES = src/showperm.c
 src_showperm_OBJECTS = src/showperm.$(OBJEXT)
 src_showperm_LDADD = $(LDADD)
@@ -884,7 +970,29 @@ am_src_testsuite_chcontext_test_OBJECTS =  \
 src_testsuite_chcontext_test_OBJECTS =  \
        $(am_src_testsuite_chcontext_test_OBJECTS)
 src_testsuite_chcontext_test_DEPENDENCIES = lib/libvserver.la \
-       $(am__DEPENDENCIES_11)
+       $(am__DEPENDENCIES_9)
+am_src_testsuite_hashcalc_OBJECTS = src/testsuite/hashcalc.$(OBJEXT)
+src_testsuite_hashcalc_OBJECTS = $(am_src_testsuite_hashcalc_OBJECTS)
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@src_testsuite_hashcalc_DEPENDENCIES =  \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@        $(am__DEPENDENCIES_7) \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@        $(am__DEPENDENCIES_2) \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@        $(am__DEPENDENCIES_1)
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@src_testsuite_hashcalc_DEPENDENCIES =  \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_9) \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_4) \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_11)
+am_src_testsuite_hashcalc_plain_OBJECTS =  \
+       src/testsuite/hashcalc-plain.$(OBJEXT)
+src_testsuite_hashcalc_plain_OBJECTS =  \
+       $(am_src_testsuite_hashcalc_plain_OBJECTS)
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@src_testsuite_hashcalc_plain_DEPENDENCIES =  \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@        $(am__DEPENDENCIES_7) \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@        $(am__DEPENDENCIES_2) \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@        $(am__DEPENDENCIES_1)
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@src_testsuite_hashcalc_plain_DEPENDENCIES =  \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_9) \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_4) \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_11)
 am_src_testsuite_rpm_fake_test_OBJECTS =  \
        src/testsuite/rpm-fake-test.$(OBJEXT)
 src_testsuite_rpm_fake_test_OBJECTS =  \
@@ -893,27 +1001,27 @@ src_testsuite_rpm_fake_test_LDADD = $(LDADD)
 am_src_testsuite_vunify_functest_OBJECTS = src/testsuite/src_testsuite_vunify_functest-vunify-functest.$(OBJEXT)
 src_testsuite_vunify_functest_OBJECTS =  \
        $(am_src_testsuite_vunify_functest_OBJECTS)
-src_testsuite_vunify_functest_DEPENDENCIES = $(am__DEPENDENCIES_11)
+src_testsuite_vunify_functest_DEPENDENCIES = $(am__DEPENDENCIES_9)
 am_src_vattribute_OBJECTS = src/vattribute.$(OBJEXT)
 src_vattribute_OBJECTS = $(am_src_vattribute_OBJECTS)
-src_vattribute_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_vattribute_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_vbuild_OBJECTS = src/vbuild.$(OBJEXT) src/vutil.$(OBJEXT) \
        src/vserver.$(OBJEXT)
 src_vbuild_OBJECTS = $(am_src_vbuild_OBJECTS)
 src_vbuild_LDADD = $(LDADD)
-am_src_vcontext_OBJECTS = src/vcontext.$(OBJEXT)
+am_src_vcontext_OBJECTS = src/vcontext.$(OBJEXT) src/vlogin.$(OBJEXT)
 src_vcontext_OBJECTS = $(am_src_vcontext_OBJECTS)
-src_vcontext_DEPENDENCIES = $(am__DEPENDENCIES_9) \
-       $(am__DEPENDENCIES_11)
+src_vcontext_DEPENDENCIES = $(am__DEPENDENCIES_11) \
+       $(am__DEPENDENCIES_9)
 am_src_vcopy_OBJECTS = src/vcopy.$(OBJEXT)
 src_vcopy_OBJECTS = $(am_src_vcopy_OBJECTS)
-src_vcopy_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_9)
+src_vcopy_DEPENDENCIES = $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_11)
 am_src_vdlimit_OBJECTS = src/vdlimit.$(OBJEXT)
 src_vdlimit_OBJECTS = $(am_src_vdlimit_OBJECTS)
-src_vdlimit_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_vdlimit_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_vdu_OBJECTS = src/vdu.$(OBJEXT)
 src_vdu_OBJECTS = $(am_src_vdu_OBJECTS)
-src_vdu_LDADD = $(LDADD)
+src_vdu_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_9)
 am_src_vhashify_OBJECTS = src/vhashify.$(OBJEXT)
 src_vhashify_OBJECTS = $(am_src_vhashify_OBJECTS)
 @ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@src_vhashify_DEPENDENCIES =  \
@@ -921,22 +1029,22 @@ src_vhashify_OBJECTS = $(am_src_vhashify_OBJECTS)
 @ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@        $(am__DEPENDENCIES_2) \
 @ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@        $(am__DEPENDENCIES_1)
 @ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@src_vhashify_DEPENDENCIES =  \
-@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_11) \
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_9) \
 @ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_4) \
-@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_9)
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@ $(am__DEPENDENCIES_11)
 am_src_vkill_OBJECTS = src/src_vkill-vkill.$(OBJEXT)
 src_vkill_OBJECTS = $(am_src_vkill_OBJECTS)
-src_vkill_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_vkill_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_vlimit_OBJECTS = src/vlimit.$(OBJEXT)
 src_vlimit_OBJECTS = $(am_src_vlimit_OBJECTS)
-src_vlimit_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_vlimit_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_vnamespace_OBJECTS = src/vnamespace.$(OBJEXT)
 src_vnamespace_OBJECTS = $(am_src_vnamespace_OBJECTS)
-src_vnamespace_DEPENDENCIES = $(am__DEPENDENCIES_9) \
-       $(am__DEPENDENCIES_11)
+src_vnamespace_DEPENDENCIES = $(am__DEPENDENCIES_11) \
+       $(am__DEPENDENCIES_9)
 am_src_vps_OBJECTS = src/vps.$(OBJEXT)
 src_vps_OBJECTS = $(am_src_vps_OBJECTS)
-src_vps_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_9)
+src_vps_DEPENDENCIES = $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_11)
 am_src_vreboot_OBJECTS = src/vreboot.$(OBJEXT)
 src_vreboot_OBJECTS = $(am_src_vreboot_OBJECTS)
 src_vreboot_LDADD = $(LDADD)
@@ -945,30 +1053,30 @@ src_vrsetup_OBJECTS = src/vrsetup.$(OBJEXT)
 src_vrsetup_LDADD = $(LDADD)
 am_src_vsched_OBJECTS = src/vsched.$(OBJEXT)
 src_vsched_OBJECTS = $(am_src_vsched_OBJECTS)
-src_vsched_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_vsched_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_9)
 am_src_vserver_info_OBJECTS = src/vserver-info.$(OBJEXT)
 src_vserver_info_OBJECTS = $(am_src_vserver_info_OBJECTS)
-src_vserver_info_DEPENDENCIES = $(am__DEPENDENCIES_11) \
-       $(am__DEPENDENCIES_9)
+src_vserver_info_DEPENDENCIES = $(am__DEPENDENCIES_9) \
+       $(am__DEPENDENCIES_11)
 am_src_vserver_stat_OBJECTS = src/vserver-stat.$(OBJEXT)
 src_vserver_stat_OBJECTS = $(am_src_vserver_stat_OBJECTS)
-src_vserver_stat_DEPENDENCIES = $(am__DEPENDENCIES_11) \
-       $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_4)
+src_vserver_stat_DEPENDENCIES = $(am__DEPENDENCIES_9) \
+       $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_4)
 am_src_vsh_OBJECTS = src/vsh.$(OBJEXT)
 src_vsh_OBJECTS = $(am_src_vsh_OBJECTS)
-src_vsh_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_vsh_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_vshelper_sync_OBJECTS = src/vshelper-sync.$(OBJEXT)
 src_vshelper_sync_OBJECTS = $(am_src_vshelper_sync_OBJECTS)
 src_vshelper_sync_LDADD = $(LDADD)
 am_src_vuname_OBJECTS = src/vuname.$(OBJEXT)
 src_vuname_OBJECTS = $(am_src_vuname_OBJECTS)
-src_vuname_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_vuname_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_src_vunify_OBJECTS = src/vunify.$(OBJEXT)
 src_vunify_OBJECTS = $(am_src_vunify_OBJECTS)
-src_vunify_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_9)
+src_vunify_DEPENDENCIES = $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_11)
 am_src_vwait_OBJECTS = src/vwait.$(OBJEXT)
 src_vwait_OBJECTS = $(am_src_vwait_OBJECTS)
-src_vwait_DEPENDENCIES = $(am__DEPENDENCIES_9)
+src_vwait_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_tests_escaperoot_OBJECTS = tests/escaperoot.$(OBJEXT)
 tests_escaperoot_OBJECTS = $(am_tests_escaperoot_OBJECTS)
 tests_escaperoot_LDADD = $(LDADD)
@@ -977,10 +1085,10 @@ tests_forkbomb_OBJECTS = $(am_tests_forkbomb_OBJECTS)
 tests_forkbomb_LDADD = $(LDADD)
 am_tests_getctx_OBJECTS = tests/getctx.$(OBJEXT)
 tests_getctx_OBJECTS = $(am_tests_getctx_OBJECTS)
-tests_getctx_DEPENDENCIES = $(am__DEPENDENCIES_9)
+tests_getctx_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_tests_getinitpid_OBJECTS = tests/getinitpid.$(OBJEXT)
 tests_getinitpid_OBJECTS = $(am_tests_getinitpid_OBJECTS)
-tests_getinitpid_DEPENDENCIES = $(am__DEPENDENCIES_9)
+tests_getinitpid_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_tests_testipc_OBJECTS = tests/testipc.$(OBJEXT)
 tests_testipc_OBJECTS = $(am_tests_testipc_OBJECTS)
 tests_testipc_LDADD = $(LDADD)
@@ -992,7 +1100,7 @@ tests_testopenf_OBJECTS = $(am_tests_testopenf_OBJECTS)
 tests_testopenf_LDADD = $(LDADD)
 am_tests_vserver_info_OBJECTS = tests/vserver-info.$(OBJEXT)
 tests_vserver_info_OBJECTS = $(am_tests_vserver_info_OBJECTS)
-tests_vserver_info_DEPENDENCIES = $(am__DEPENDENCIES_9)
+tests_vserver_info_DEPENDENCIES = $(am__DEPENDENCIES_11)
 am_vserver_start_vserver_start_bin_OBJECTS =  \
        vserver-start/main.$(OBJEXT) vserver-start/mount.$(OBJEXT) \
        vserver-start/defaulttty.$(OBJEXT) \
@@ -1007,8 +1115,8 @@ am_vserver_start_vserver_start_bin_OBJECTS =  \
        vserver-start/configuration-init.$(OBJEXT)
 vserver_start_vserver_start_bin_OBJECTS =  \
        $(am_vserver_start_vserver_start_bin_OBJECTS)
-vserver_start_vserver_start_bin_DEPENDENCIES = $(am__DEPENDENCIES_9) \
-       $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_4)
+vserver_start_vserver_start_bin_DEPENDENCIES = $(am__DEPENDENCIES_11) \
+       $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_4)
 initrdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 legacySCRIPT_INSTALL = $(INSTALL_SCRIPT)
 pkglibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -1081,7 +1189,9 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-cflags-v13.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-cflags_list-compat.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-cflags_list-v13.Po \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-checkversion.Po \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-createskeleton.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-getfilecontext.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-getinsecurebcaps.Po \
@@ -1108,6 +1218,7 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-ncaps_list-net.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-nflags-net.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-nflags_list-net.Po \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-parselimit.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-personalityflag.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-personalityflag_list.Po \
@@ -1119,6 +1230,7 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_cleanupnamespace.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxcreate.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxmigrate.Po \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_enternamespace.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_getccaps.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_getcflags.Po \
@@ -1127,8 +1239,10 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_getncaps.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_getnflags.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_getnxinfo.Po \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_gettasknid.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_gettaskxid.Po \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_getvhiname.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_getvxinfo.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_kill.Po \
@@ -1137,7 +1251,9 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_netmigrate.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_netremove.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_remdlimit.Po \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimit.Po \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_setccaps.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_setcflags.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_setdlimit.Po \
@@ -1147,6 +1263,7 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_setnflags.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_setsched.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_setvhiname.Po \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-syscall_waitexit.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-val2text-t2v-uint32.Po \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_a-val2text-t2v-uint64.Po \
@@ -1162,7 +1279,9 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-cflags-v13.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-cflags_list-compat.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-cflags_list-v13.Plo \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-checkversion.Plo \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-createskeleton.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-getfilecontext.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-getinsecurebcaps.Plo \
@@ -1189,6 +1308,7 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-ncaps_list-net.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-nflags-net.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-nflags_list-net.Plo \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-parselimit.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-personalityflag.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-personalityflag_list.Plo \
@@ -1200,6 +1320,7 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_cleanupnamespace.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxcreate.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxmigrate.Plo \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_enternamespace.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_getccaps.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_getcflags.Plo \
@@ -1208,8 +1329,10 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_getncaps.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_getnflags.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_getnxinfo.Plo \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_gettasknid.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_gettaskxid.Plo \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_getvhiname.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_getvxinfo.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_kill.Plo \
@@ -1218,7 +1341,9 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_netmigrate.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_netremove.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_remdlimit.Plo \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimit.Plo \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_setccaps.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_setcflags.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_setdlimit.Plo \
@@ -1228,6 +1353,7 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_setnflags.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_setsched.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_setvhiname.Plo \
+@AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-syscall_waitexit.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-val2text-t2v-uint32.Plo \
 @AMDEP_TRUE@   lib/$(DEPDIR)/lib_libvserver_la-val2text-t2v-uint64.Plo \
@@ -1271,6 +1397,7 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-canonify.Po \
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-exitlikeprocess.Po \
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumber.Po \
+@AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Po \
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-lockfile.Po \
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-safechdir.Po \
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-command-appendparameter.Po \
@@ -1306,11 +1433,13 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-canonify.Po \
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-exitlikeprocess.Po \
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumber.Po \
+@AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Po \
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-lockfile.Po \
 @AMDEP_TRUE@   lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-safechdir.Po \
 @AMDEP_TRUE@   lib_internal/testsuite/$(DEPDIR)/command.Po \
 @AMDEP_TRUE@   lib_internal/testsuite/$(DEPDIR)/copy.Po \
 @AMDEP_TRUE@   lib_internal/testsuite/$(DEPDIR)/filecfg-ml.Po \
+@AMDEP_TRUE@   lib_internal/testsuite/$(DEPDIR)/isnumber.Po \
 @AMDEP_TRUE@   lib_internal/testsuite/$(DEPDIR)/sigbus.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/capchroot.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/chain-echo.Po \
@@ -1326,6 +1455,9 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   src/$(DEPDIR)/listdevip.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/lockfile.Po src/$(DEPDIR)/lsxid.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/mask2prefix.Po \
+@AMDEP_TRUE@   src/$(DEPDIR)/naddress.Po \
+@AMDEP_TRUE@   src/$(DEPDIR)/nattribute.Po \
+@AMDEP_TRUE@   src/$(DEPDIR)/ncontext.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/parserpmdump.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/readlink.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/rebootmgr.Po \
@@ -1341,7 +1473,7 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   src/$(DEPDIR)/vbuild.Po src/$(DEPDIR)/vcontext.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/vcopy.Po src/$(DEPDIR)/vdlimit.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/vdu.Po src/$(DEPDIR)/vhashify.Po \
-@AMDEP_TRUE@   src/$(DEPDIR)/vlimit.Po \
+@AMDEP_TRUE@   src/$(DEPDIR)/vlimit.Po src/$(DEPDIR)/vlogin.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/vnamespace.Po src/$(DEPDIR)/vps.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/vreboot.Po src/$(DEPDIR)/vrsetup.Po \
 @AMDEP_TRUE@   src/$(DEPDIR)/vsched.Po \
@@ -1353,6 +1485,8 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   src/$(DEPDIR)/vutil.Po src/$(DEPDIR)/vwait.Po \
 @AMDEP_TRUE@   src/testsuite/$(DEPDIR)/chbind-test.Po \
 @AMDEP_TRUE@   src/testsuite/$(DEPDIR)/chcontext-test.Po \
+@AMDEP_TRUE@   src/testsuite/$(DEPDIR)/hashcalc-plain.Po \
+@AMDEP_TRUE@   src/testsuite/$(DEPDIR)/hashcalc.Po \
 @AMDEP_TRUE@   src/testsuite/$(DEPDIR)/rpm-fake-test.Po \
 @AMDEP_TRUE@   src/testsuite/$(DEPDIR)/src_testsuite_vunify_functest-vunify-functest.Po \
 @AMDEP_TRUE@   tests/$(DEPDIR)/escaperoot.Po \
@@ -1408,22 +1542,29 @@ SOURCES = $(nodist_lib_dietlibc_not_enabled_error_a_SOURCES) \
        $(lib_internal_testsuite_command_SOURCES) \
        $(lib_internal_testsuite_copy_SOURCES) \
        $(lib_internal_testsuite_filecfg_ml_SOURCES) \
+       $(lib_internal_testsuite_isnumber_SOURCES) \
+       $(lib_internal_testsuite_isnumber_gnu_SOURCES) \
        $(lib_internal_testsuite_sigbus_SOURCES) \
+       $(lib_internal_testsuite_sigbus_gnu_SOURCES) \
        $(src_capchroot_SOURCES) $(src_chain_echo_SOURCES) \
-       $(src_chbind_SOURCES) $(src_chcontext_compat_SOURCES) \
+       $(src_chbind_compat_SOURCES) $(src_chcontext_compat_SOURCES) \
        src/check-unixfile.c $(src_chroot_sh_SOURCES) \
        $(src_chxid_SOURCES) $(src_exec_cd_SOURCES) \
        $(src_exec_ulimit_SOURCES) $(src_fakerunlevel_SOURCES) \
        $(src_filetime_SOURCES) $(src_ifspec_SOURCES) \
        $(src_keep_ctx_alive_SOURCES) $(src_listdevip_SOURCES) \
        $(src_lockfile_SOURCES) $(src_lsxid_SOURCES) \
-       $(src_mask2prefix_SOURCES) $(src_parserpmdump_SOURCES) \
-       $(src_readlink_SOURCES) $(src_rebootmgr_SOURCES) \
-       $(src_reducecap_SOURCES) $(src_rpm_fake_resolver_SOURCES) \
-       $(src_save_ctxinfo_SOURCES) $(src_secure_mount_SOURCES) \
-       $(src_setattr_SOURCES) $(src_showattr_SOURCES) src/showperm.c \
-       src/sigexec.c $(src_testsuite_chbind_test_SOURCES) \
+       $(src_mask2prefix_SOURCES) $(src_naddress_SOURCES) \
+       $(src_nattribute_SOURCES) $(src_ncontext_SOURCES) \
+       $(src_parserpmdump_SOURCES) $(src_readlink_SOURCES) \
+       $(src_rebootmgr_SOURCES) $(src_reducecap_SOURCES) \
+       $(src_rpm_fake_resolver_SOURCES) $(src_save_ctxinfo_SOURCES) \
+       $(src_secure_mount_SOURCES) $(src_setattr_SOURCES) \
+       $(src_showattr_SOURCES) src/showperm.c src/sigexec.c \
+       $(src_testsuite_chbind_test_SOURCES) \
        $(src_testsuite_chcontext_test_SOURCES) \
+       $(src_testsuite_hashcalc_SOURCES) \
+       $(src_testsuite_hashcalc_plain_SOURCES) \
        $(src_testsuite_rpm_fake_test_SOURCES) \
        $(src_testsuite_vunify_functest_SOURCES) \
        $(src_vattribute_SOURCES) $(src_vbuild_SOURCES) \
@@ -1456,22 +1597,29 @@ DIST_SOURCES = $(am__lib_libvserver_a_SOURCES_DIST) \
        $(lib_internal_testsuite_command_SOURCES) \
        $(lib_internal_testsuite_copy_SOURCES) \
        $(lib_internal_testsuite_filecfg_ml_SOURCES) \
+       $(lib_internal_testsuite_isnumber_SOURCES) \
+       $(lib_internal_testsuite_isnumber_gnu_SOURCES) \
        $(lib_internal_testsuite_sigbus_SOURCES) \
+       $(lib_internal_testsuite_sigbus_gnu_SOURCES) \
        $(src_capchroot_SOURCES) $(src_chain_echo_SOURCES) \
-       $(src_chbind_SOURCES) $(src_chcontext_compat_SOURCES) \
+       $(src_chbind_compat_SOURCES) $(src_chcontext_compat_SOURCES) \
        src/check-unixfile.c $(src_chroot_sh_SOURCES) \
        $(src_chxid_SOURCES) $(src_exec_cd_SOURCES) \
        $(src_exec_ulimit_SOURCES) $(src_fakerunlevel_SOURCES) \
        $(src_filetime_SOURCES) $(src_ifspec_SOURCES) \
        $(src_keep_ctx_alive_SOURCES) $(src_listdevip_SOURCES) \
        $(src_lockfile_SOURCES) $(src_lsxid_SOURCES) \
-       $(src_mask2prefix_SOURCES) $(src_parserpmdump_SOURCES) \
-       $(src_readlink_SOURCES) $(src_rebootmgr_SOURCES) \
-       $(src_reducecap_SOURCES) $(src_rpm_fake_resolver_SOURCES) \
-       $(src_save_ctxinfo_SOURCES) $(src_secure_mount_SOURCES) \
-       $(src_setattr_SOURCES) $(src_showattr_SOURCES) src/showperm.c \
-       src/sigexec.c $(src_testsuite_chbind_test_SOURCES) \
+       $(src_mask2prefix_SOURCES) $(src_naddress_SOURCES) \
+       $(src_nattribute_SOURCES) $(src_ncontext_SOURCES) \
+       $(src_parserpmdump_SOURCES) $(src_readlink_SOURCES) \
+       $(src_rebootmgr_SOURCES) $(src_reducecap_SOURCES) \
+       $(src_rpm_fake_resolver_SOURCES) $(src_save_ctxinfo_SOURCES) \
+       $(src_secure_mount_SOURCES) $(src_setattr_SOURCES) \
+       $(src_showattr_SOURCES) src/showperm.c src/sigexec.c \
+       $(src_testsuite_chbind_test_SOURCES) \
        $(src_testsuite_chcontext_test_SOURCES) \
+       $(src_testsuite_hashcalc_SOURCES) \
+       $(src_testsuite_hashcalc_plain_SOURCES) \
        $(src_testsuite_rpm_fake_test_SOURCES) \
        $(src_testsuite_vunify_functest_SOURCES) \
        $(src_vattribute_SOURCES) $(src_vbuild_SOURCES) \
@@ -1527,6 +1675,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BZIP2 = @BZIP2@
 CAT = @CAT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -1534,10 +1683,9 @@ CFLAGS = @CFLAGS@
 CHOWN = @CHOWN@
 CMP = @CMP@
 CP = @CP@
+CPIO = @CPIO@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CVS2CL = @CVS2CL@
-CVS2CL_TAG = @CVS2CL_TAG@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -1574,12 +1722,12 @@ ENV = @ENV@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+FILE = @FILE@
 GPG_KEY = @GPG_KEY@
 GREP = @GREP@
-HAVE_CVS2CL_FALSE = @HAVE_CVS2CL_FALSE@
-HAVE_CVS2CL_TRUE = @HAVE_CVS2CL_TRUE@
-HAVE_RCS2LOG_FALSE = @HAVE_RCS2LOG_FALSE@
-HAVE_RCS2LOG_TRUE = @HAVE_RCS2LOG_TRUE@
+GZIP = @GZIP@
+HAVE_SVN2CL_FALSE = @HAVE_SVN2CL_FALSE@
+HAVE_SVN2CL_TRUE = @HAVE_SVN2CL_TRUE@
 HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
 HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 HAVE_XSLTP_FALSE = @HAVE_XSLTP_FALSE@
@@ -1626,16 +1774,18 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
-RCS2LOG = @RCS2LOG@
 RELEASE_CPPFLAGS = @RELEASE_CPPFLAGS@
+RESTORE = @RESTORE@
 RM = @RM@
 RMDIR = @RMDIR@
 RMMOD = @RMMOD@
+RSYNC = @RSYNC@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SH = @SH@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SVN2CL = @SVN2CL@
 TAC = @TAC@
 TAR = @TAR@
 TOUCH = @TOUCH@
@@ -1681,7 +1831,6 @@ includedir = @includedir@
 infodir = @infodir@
 initrddir = @initrddir@
 install_sh = @install_sh@
-kernelincludedir = @kernelincludedir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
@@ -1701,8 +1850,8 @@ target_alias = @target_alias@
 vserverdir = @vserverdir@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = . distrib
-CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map --show-dead -S --no-wrap
-CVS2CL_ALLFLAGS := $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS)
+SVN2CL_AMFLAGS = $(SVN2CL_TAG) --authors=svnusers.map
+SVN2CL_ALLFLAGS := $(SVN2CL_AMFLAGS) $(SVN2CL_FLAGS)
 confdir = $(sysconfdir)/vservers
 confdefaultsdir = $(confdir)/.defaults
 sbincfgdir = $(sbindir)
@@ -1712,6 +1861,7 @@ noinst_HEADERS = $(ENSC_VECTOR_HDRS) \
                        compat.h compat-c99.h\
 lib/syscall-compat.hc \
                                lib/syscall-legacy.hc \
+                               lib/syscall-fallback.h \
                                lib/createskeleton-full.hc \
                                lib/createskeleton-short.hc \
                                lib/fmt.h \
@@ -1755,8 +1905,10 @@ ensc_wrappers/wrappers-clone.hc \
                                ensc_wrappers/wrappers-pivot.hc \
                                ensc_wrappers/wrappers-resource.hc \
                                ensc_wrappers/wrappers-socket.hc \
+                               ensc_wrappers/wrappers-stat.hc \
                                ensc_wrappers/wrappers-stdlib.hc \
                                ensc_wrappers/wrappers-string.hc \
+                               ensc_wrappers/wrappers-termios.hc \
                                ensc_wrappers/wrappers-unistd.hc \
                                ensc_wrappers/wrappers-vserver.hc \
                                ensc_wrappers/wrappers-wait.hc \
@@ -1788,7 +1940,7 @@ ensc_wrappers/wrappers-clone.hc \
                                lib_internal/util-unixsock.h \
                                lib_internal/string.hc
 
-noinst_LIBRARIES = $(ENSC_VECTOR_LIBS) $(LIBINTERNAL_GLIBC) $(am__append_10)
+noinst_LIBRARIES = $(ENSC_VECTOR_LIBS) $(LIBINTERNAL_GLIBC) $(am__append_12)
 lib_LIBRARIES = $(am__append_2)
 lib_LTLIBRARIES = $(LIBVSERVER_GLIBC)
 pkglib_LTLIBRARIES = src/rpm-fake.la
@@ -1803,7 +1955,9 @@ initrd_SCRIPTS = $(sysv_src_SCRPTS) \
                        $(sysv_gen_SCRPTS)
 
 sysconf_DATA = $(sysv_conf_DTA)
-DIETPROGS = $(LIBENSCVECTOR_DIET) lib/lib_libvserver_a-% lib/testsuite/cflags \
+DIETPROGS = $(LIBENSCVECTOR_DIET) lib/lib_libvserver_a-%               \
+                               ensc_fmt/lib_libvserver_a-%\
+lib/testsuite/cflags \
                                lib/testsuite/personality \
                                lib/testsuite/fmt\
 src/chcontext-compat \
@@ -1817,7 +1971,7 @@ src/chcontext-compat \
                        src/secure-mount \
                        src/save_ctxinfo \
                        src/mask2prefix \
-                       src/chbind \
+                       src/chbind-compat \
                        src/exec-cd \
                        src/fakerunlevel \
                        src/keep-ctx-alive \
@@ -1845,43 +1999,29 @@ src/chcontext-compat \
                        src/vserver-info \
                        src/vdlimit \
                        src/vsh \
-                       src/vwait\
-$(am__append_3) $(tests_dietprogs) lib_internal/libinternal-diet.a $(am__append_13)
-BUILT_SOURCES = pathconfig.h linuxvirtual.h \
+                       src/vdu \
+                       src/vwait \
+                       src/ncontext \
+                       src/nattribute \
+                       src/naddress\
+$(am__append_3) $(tests_dietprogs) lib_internal/libinternal-diet.a lib_internal/testsuite/isnumber \
+                               lib_internal/testsuite/sigbus\
+$(am__append_15)
+BUILT_SOURCES = pathconfig.h \
                        .fixups
 
 man_MANS = $(man_pages)
-kernel_HDRS = kernel/context.h \
-                       kernel/context_cmd.h    \
-                       kernel/cvirt.h          \
-                       kernel/cvirt_cmd.h      \
-                       kernel/cvirt_def.h      \
-                       kernel/debug.h          \
-                       kernel/debug_cmd.h      \
-                       kernel/dlimit.h         \
-                       kernel/dlimit_cmd.h     \
-                       kernel/inode.h          \
-                       kernel/inode_cmd.h      \
-                       kernel/legacy.h         \
-                       kernel/limit.h          \
-                       kernel/limit_cmd.h      \
-                       kernel/limit_def.h      \
-                       kernel/namespace.h      \
-                       kernel/namespace_cmd.h  \
-                       kernel/network.h        \
-                       kernel/network_cmd.h    \
-                       kernel/sched.h          \
-                       kernel/sched_cmd.h      \
-                       kernel/sched_def.h      \
-                       kernel/signal_cmd.h     \
-                       kernel/switch.h         \
-                       kernel/xid.h
-
+kernel_HDRS = $(wildcard kernel/*.h)
 EXTRA_DIST = pathconfig.h.pathsubst \
                        util-vserver.spec \
                        THANKS REQUIREMENTS \
                        $(kernel_HDRS)\
-lib/apidoc/list2xxx.syntax $(src_testsuite_check_src_SCRPTS) $(doc_compatibility_SRCS) \
+lib/apidoc/list2xxx.syntax $(src_testsuite_check_src_SCRPTS) \
+                                       src/testsuite/vunify-test.sh \
+                                       src/testsuite/hashcalc.sh \
+                                       src/testsuite/hashcalc-plain.sh \
+                                       src/testsuite/vwait-test.sh\
+$(doc_compatibility_SRCS) \
                                $(doc_configuration_SRCS) \
                                $(doc_old_doc) \
                                $(doc_gen_DOCS)\
@@ -1906,7 +2046,9 @@ $(contrib_subst_SRCS) \
                                        contrib/yum-2.2.1-chroot.patch \
                                        contrib/yum-2.3.2-chroot.patch \
                                        contrib/yum-2.3.3-chroot.patch \
-                                       contrib/yum-2.3.4-chroot.patch\
+                                       contrib/yum-2.3.4-chroot.patch \
+                                       contrib/yum-2.6.0-chroot.patch \
+                                       contrib/yum-2.9.6-chroot.patch\
 lib_internal/testsuite/copy-check $(addsuffix .pc.subst, $(PKGCONFIG_FILES))
 check_SCRIPTS = $(src_testsuite_check_src_SCRPTS) \
                                        $(src_testsuite_check_gen_SCRPTS)
@@ -1921,7 +2063,7 @@ $(src_testsuite_check_active_PRGS) \
                                        $(src_testsuite_check_gen_SCRPTS)\
 ensc_vector/testsuite/test1 \
                                ensc_vector/testsuite/test2\
-$(am__append_12)
+$(am__append_14)
 TESTS_ENVIRONMENT = ensc_use_expensive_tests="$(ENSC_USE_EXPENSIVE_TESTS)" \
                        ensc_test_debug="$(TESTS_DEBUG)"\
 srctestsuitedir=$(top_builddir)/src/testsuite libinternaltestsuitedir=$(top_builddir)/lib_internal/testsuite
@@ -1933,7 +2075,7 @@ CLEANFILES = $(BUILT_SOURCES) \
                        pathconfig.h .fixups\
 lib/libvserver.la \
                                lib/libvserver.a\
-lib/apidoc/.apidoc doc/*.raw.html* doc/*.html.tmp $(am__append_6) $(am__append_7) $(scripts_pkglib_gen_DTA) \
+lib/apidoc/.apidoc doc/*.raw.html* doc/*.html.tmp $(am__append_8) $(am__append_9) $(scripts_pkglib_gen_DTA) \
                                $(scripts_sbin_gen_PRGS) \
                                $(scripts_sbincfg_gen_DTA) \
                                $(scripts_legacy_gen_SCRPTS)\
@@ -1953,7 +2095,6 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = \
                        src/mask2prefix \
                        src/ifspec \
                        src/rebootmgr \
-                       src/vdu \
                        src/vfiles\
 \
                                scripts/vapt-get-worker \
@@ -1989,6 +2130,7 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                        s!@'CONFDIR'@!$(confdir)!g; \
                        s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
                        s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \
+                       s!@'PKGCACHEDIR'@!$(pkgcachedir)!g; \
                        s!@'PKGSTATEREVDIR'@!$(pkgstaterevdir)!g; \
                        s!@'VSERVERDIR'@!$(vserverdir)!g; \
                        s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
@@ -2010,6 +2152,7 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                        s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g; \
                        $(ENSC_PATHPROG_SED)
 
+pkgcachedir = $(localstatedir)/cache/vservers
 pkgstatedir = $(localstatedir)/run/vservers
 pkgstaterevdir = $(confdefaultsdir)/run.rev
 vserverpkgdir = $(vserverdir)/.pkg
@@ -2030,7 +2173,8 @@ lib_compat_SRCS = lib/cflags-compat.c \
                                lib/cflags_list-compat.c
 
 lib_legacy_SRCS = lib/getprocentry-legacy.c
-lib_management_SRCS = lib/createskeleton.c \
+lib_management_SRCS = lib/comparevserverbyid.c \
+                               lib/createskeleton.c \
                                lib/getvserverbyctx.c \
                                lib/getvserverbyctx-compat.hc \
                                lib/getvserverbyctx-v13.hc \
@@ -2040,7 +2184,8 @@ lib_management_SRCS = lib/createskeleton.c \
                                lib/getvserverctx.c \
                                lib/getvservername.c \
                                lib/getvservervdir.c \
-                               lib/xidopt2xid.c
+                               lib/xidopt2xid.c \
+                               lib/nidopt2nid.c
 
 lib_v11_SRCS = lib/syscall_rlimit.c \
                                lib/syscall_rlimit-v11.hc \
@@ -2101,6 +2246,7 @@ lib_v13_SRCS = lib/syscall_ctxcreate.c \
                                lib/syscall_setnflags-net.hc \
                                lib/syscall_setnflags.c \
                                lib/syscall_setsched-v13.hc \
+                               lib/syscall_setsched-v13obs.hc \
                                lib/syscall_setsched.c \
                                lib/syscall_setvhiname-olduts.hc \
                                lib/syscall_setvhiname-v13.hc \
@@ -2118,9 +2264,28 @@ lib_v13_SRCS = lib/syscall_ctxcreate.c \
                                lib/nflags-net.c \
                                lib/nflags_list-net.c\
 $(am__append_1)
+lib_v21_SRCS = lib/syscall_setccaps-v21.hc \
+                               lib/syscall_setsched-v21.hc \
+                               lib/syscall_rlimitstat.c \
+                               lib/syscall_rlimitstat-v21.hc \
+                               lib/syscall_resetminmax.c \
+                               lib/syscall_resetminmax-v21.hc \
+                               lib/syscall_getvci.c \
+                               lib/syscall_getvci-v21.hc \
+                               lib/syscall_virtstat.c \
+                               lib/syscall_virtstat-v21.hc \
+                               lib/syscall_ctxstat.c \
+                               lib/syscall_ctxstat-v21.hc \
+                               lib/syscall_getspacemask.c \
+                               lib/syscall_getspacemask-v21.hc \
+                               lib/syscall_enternamespace-v21.hc \
+                               lib/syscall_setnamespace-v21.hc \
+                               lib/syscall_ctxmigrate-v21.hc
+
 PKGCONFIG_FILES = lib/util-vserver
 lib_SRCS = lib/syscall.c \
                                lib/checkversion.c \
+                               lib/checkconfig.c \
                                lib/isdirectory.c \
                                lib/isfile.c \
                                lib/islink.c \
@@ -2150,6 +2315,7 @@ lib_SRCS = lib/syscall.c \
                                $(lib_management_SRCS) \
                                $(lib_v11_SRCS) \
                                $(lib_v13_SRCS) \
+                               $(lib_v21_SRCS) \
                                $(ensc_fmt_SRCS)
 
 LIBVSERVER_GLIBC = lib/libvserver.la
@@ -2184,23 +2350,24 @@ src_pkglib_C99_PROGS = src/vunify src/vcopy
 src_capchroot_SOURCES = src/capchroot.c
 src_capchroot_LDADD = $(VSERVER_LDADDS)
 src_capchroot_LDFLAGS = $(VSERVER_LDFLGS)
-src_chbind_SOURCES = src/chbind.c
-src_chbind_LDADD = $(VSERVER_LDADDS)
-src_chbind_LDFLAGS = $(VSERVER_LDFLGS)
+src_chbind_compat_SOURCES = src/chbind.c
+src_chbind_compat_LDADD = $(VSERVER_LDADDS)
+src_chbind_compat_LDFLAGS = $(VSERVER_LDFLGS)
 src_chcontext_compat_SOURCES = src/chcontext.c
 src_chcontext_compat_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_chcontext_compat_LDFLAGS = $(VSERVER_LDFLGS)
-src_vcontext_SOURCES = src/vcontext.c
+src_vcontext_SOURCES = src/vcontext.c src/vlogin.c
 src_vcontext_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_vcontext_LDFLAGS = $(VSERVER_LDFLGS)
 src_vsched_SOURCES = src/vsched.c
-src_vsched_LDADD = $(VSERVER_LDADDS)
+src_vsched_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_vsched_LDFLAGS = $(VSERVER_LDFLGS)
 src_filetime_SOURCES = src/filetime.c
 src_filetime_LDADD = $(VSERVER_LDADDS)
 src_filetime_LDFLAGS = $(VSERVER_LDFLGS)
 src_chain_echo_SOURCES = src/chain-echo.c
 src_chroot_sh_SOURCES = src/chroot-sh.c
+src_chroot_sh_LDADD = $(LIBINTERNAL)
 src_exec_cd_SOURCES = src/exec-cd.c
 src_fakerunlevel_SOURCES = src/fakerunlevel.c
 src_ifspec_SOURCES = src/ifspec.c
@@ -2225,6 +2392,8 @@ src_save_ctxinfo_SOURCES = src/save_ctxinfo.c
 src_save_ctxinfo_LDADD = $(VSERVER_LDADDS)
 src_save_ctxinfo_LDFLAGS = $(VSERVER_LDFLGS)
 src_vdu_SOURCES = src/vdu.c
+src_vdu_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL)
+src_vdu_LDFLAGS = $(VSERVER_LDFLGS)
 src_vreboot_SOURCES = src/vreboot.c
 src_secure_mount_SOURCES = src/secure-mount.c
 src_secure_mount_LDADD = $(VSERVER_LDADDS)
@@ -2291,6 +2460,15 @@ src_vsh_LDFLAGS = $(VSERVER_LDFLGS)
 src_vwait_SOURCES = src/vwait.c
 src_vwait_LDADD = $(VSERVER_LDADDS)
 src_vwait_LDFLAGS = $(VSERVER_LDFLGS)
+src_ncontext_SOURCES = src/ncontext.c
+src_ncontext_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL)
+src_ncontext_LDFLAGS = $(VSERVER_LDFLGS)
+src_nattribute_SOURCES = src/nattribute.c
+src_nattribute_LDADD = $(VSERVER_LDADDS)
+src_nattribute_LDFLAGS = $(VSERVER_LDFLGS)
+src_naddress_SOURCES = src/naddress.c
+src_naddress_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL)
+src_naddress_LDFLAGS = $(VSERVER_LDFLGS)
 @ENSC_HAVE_C99_COMPILER_FALSE@src_sbin_C99_X_PROGS = 
 @ENSC_HAVE_C99_COMPILER_TRUE@src_sbin_C99_X_PROGS = $(src_sbin_C99_PROGS)
 @ENSC_HAVE_C99_COMPILER_FALSE@src_pkglib_C99_X_PROGS = 
@@ -2303,9 +2481,9 @@ src_testsuite_check_active_PRGS = src/testsuite/vunify-functest \
                                        src/testsuite/chcontext-test \
                                        src/testsuite/chbind-test
 
-src_testsuite_check_passive_PRGS = src/testsuite/rpm-fake-test
+src_testsuite_check_passive_PRGS = src/testsuite/rpm-fake-test $(am__append_6)
 @ENSC_HAVE_C99_COMPILER_FALSE@src_testsuite_check_src_C99_SCRPTS = 
-@ENSC_HAVE_C99_COMPILER_TRUE@src_testsuite_check_src_C99_SCRPTS = src/testsuite/vunify-test.sh
+@ENSC_HAVE_C99_COMPILER_TRUE@src_testsuite_check_src_C99_SCRPTS = src/testsuite/vunify-test.sh $(am__append_7)
 src_testsuite_check_src_SCRPTS = $(src_testsuite_check_src_C99_SCRPTS)
 src_testsuite_check_gen_SCRPTS = 
 src_testsuite_rpm_fake_test_SOURCES = src/testsuite/rpm-fake-test.c
@@ -2316,6 +2494,16 @@ src_testsuite_chcontext_test_SOURCES = src/testsuite/chcontext-test.c
 src_testsuite_chcontext_test_LDADD = lib/libvserver.la $(LIBINTERNAL)
 src_testsuite_chbind_test_SOURCES = src/testsuite/chbind-test.c
 src_testsuite_chbind_test_LDADD = lib/libvserver.la
+src_testsuite_hashcalc_SOURCES = src/testsuite/hashcalc.c
+src_testsuite_hashcalc_plain_SOURCES = src/testsuite/hashcalc-plain.c
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@src_testsuite_hashcalc_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@src_testsuite_hashcalc_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS)
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@src_testsuite_hashcalc_LDFLAGS = 
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@src_testsuite_hashcalc_LDFLAGS = $(VSERVER_LDFLGS)
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@src_testsuite_hashcalc_plain_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@src_testsuite_hashcalc_plain_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS)
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE@src_testsuite_hashcalc_plain_LDFLAGS = 
+@ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE@src_testsuite_hashcalc_plain_LDFLAGS = $(VSERVER_LDFLGS)
 src_testsuite_CPPFLAGS = -I $(top_srcdir)/src -D ENSC_TESTSUITE
 doc_old_doc = doc/intro.txt
 XSLT_AMFLAGS = --stringparam confdir '$(sysconfdir)/vservers'
@@ -2327,7 +2515,8 @@ doc_configuration_SRCS = doc/configuration.xml \
                                doc/configuration.xsd \
                                doc/configuration.dtd \
                                doc/configuration.css \
-                               doc/configuration-xhtml.xsl
+                               doc/configuration-xhtml.xsl \
+                               doc/configuration-wiki.xsl
 
 doc_compatibility_SRCS = doc/compatibility.xml \
                                doc/compatibility.dtd \
@@ -2346,11 +2535,15 @@ man_pages = man/chbind.8 \
                           man/vtop.8
 
 scripts_pkglib_src_DTA = scripts/functions \
+                               scripts/magic.mime \
                                scripts/vserver-build.apt-rpm \
                                scripts/vserver-build.skeleton \
                                scripts/vserver-build.debootstrap \
+                               scripts/vserver-build.fai \
                                scripts/vserver-build.rpm \
                                scripts/vserver-build.yum \
+                               scripts/vserver-build.template \
+                               scripts/vserver-build.rsync \
                                scripts/vserver-build.functions \
                                scripts/vserver-build.functions.apt \
                                scripts/vserver-build.functions.rpm \
@@ -2360,7 +2553,8 @@ scripts_pkglib_src_DTA = scripts/functions \
                                scripts/vserver.functions \
                                scripts/vserver.start \
                                scripts/vserver.stop \
-                               scripts/vserver.suexec
+                               scripts/vserver.suexec \
+                               scripts/vserver.delete
 
 scripts_pkglib_gen_DTA = scripts/util-vserver-vars
 scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \
@@ -2385,17 +2579,22 @@ scripts_legacy_src_SCRPTS = scripts/legacy/save_s_context \
 
 scripts_legacy_gen_SCRPTS = scripts/legacy/vps
 scripts_legacy_src_PRGS = scripts/legacy/vserver-copy
-scripts_sbin_src_PRGS = scripts/chcontext \
+scripts_sbin_src_PRGS = scripts/chbind \
+                               scripts/chcontext \
                                scripts/vapt-get \
+                               scripts/vdispatch-conf \
+                               scripts/vemerge \
+                               scripts/vesync \
                                scripts/vpstree \
                                scripts/vrpm \
                                scripts/vserver \
                                scripts/vsomething \
                                scripts/vtop \
+                               scripts/vupdateworld \
+                               scripts/vyum \
                                scripts/vcached \
                                scripts/vuseradd \
-                               scripts/vuserdel \
-                               scripts/vyum
+                               scripts/vuserdel
 
 scripts_sbin_gen_PRGS = 
 scripts_sbincfg_gen_DTA = 
@@ -2475,7 +2674,7 @@ libensc_vector_glibc_a_SOURCES = $(ENSC_VECTOR_SRCS)
 libensc_vector_glibc_a_CPPFLAGS = $(AM_CPPFLAGS)
 libensc_vector_diet_a_SOURCES = $(ENSC_VECTOR_SRCS)
 libensc_vector_diet_a_CPPFLAGS = $(AM_CPPFLAGS)
-ENSC_VECTOR_LIBS = $(am__append_8) $(am__append_9)
+ENSC_VECTOR_LIBS = $(am__append_10) $(am__append_11)
 @ENSC_USE_GLIBC_FALSE@LIBENSCVECTOR_GLIBC = lib-glibc-not-enabled-error.a
 @ENSC_USE_GLIBC_TRUE@LIBENSCVECTOR_GLIBC = libensc_vector-glibc.a
 @ENSC_USE_DIETLIBC_FALSE@LIBENSCVECTOR_DIET = lib-dietlibc-not-enabled-error.a
@@ -2540,7 +2739,9 @@ lib_internal_libinternal_common_SRCS = \
                                lib_internal/unify-isiunlinkable.c \
                                lib_internal/util-canonify.c \
                                lib_internal/util-exitlikeprocess.c \
+                               lib_internal/util-isnumber.hc \
                                lib_internal/util-isnumber.c \
+                               lib_internal/util-isnumberunsigned.c \
                                lib_internal/util-lockfile.c \
                                lib_internal/util-safechdir.c \
                                $(command_SRCS) \
@@ -2562,7 +2763,12 @@ lib_internal_testsuite_filecfg_ml_SOURCES = lib_internal/testsuite/filecfg-ml.c
 lib_internal_testsuite_filecfg_ml_LDADD = $(LIBINTERNAL_GLIBC)
 lib_internal_testsuite_copy_SOURCES = lib_internal/testsuite/copy.c
 lib_internal_testsuite_copy_LDADD = $(LIBINTERNAL_GLIBC)
+lib_internal_testsuite_isnumber_SOURCES = lib_internal/testsuite/isnumber.c
+lib_internal_testsuite_isnumber_LDADD = $(LIBINTERNAL)
+lib_internal_testsuite_isnumber_gnu_SOURCES = lib_internal/testsuite/isnumber.c
+lib_internal_testsuite_isnumber_gnu_LDADD = $(LIBINTERNAL_GLIBC)
 lib_internal_testsuite_sigbus_SOURCES = lib_internal/testsuite/sigbus.c
+lib_internal_testsuite_sigbus_gnu_SOURCES = lib_internal/testsuite/sigbus.c
 vserver_start_vserver_start_bin_SOURCES = \
                                                vserver-start/main.c \
                                                vserver-start/mount.c \
@@ -2595,6 +2801,17 @@ BAD_INC_PATHS = /usr/include|/usr/local/include
 BAD_LIB_PATHS = /usr/lib
 pkgconfdir = $(libdir)/pkgconfig
 pkgconf_DATA = $(addsuffix .pc, $(PKGCONFIG_FILES))
+pkgconf_SUBST = s!@'PACKAGE'@!$(PACKAGE)!g;                                    \
+                       s!@'VERSION'@!$(VERSION)!g;                                     \
+                       s!@'prefix'@!$(prefix)!g;                                       \
+                       s!@'exec_prefix'@!$(exec_prefix)!g;                             \
+                       s!@'libdir'@!$(libdir)!g;                                       \
+                       s!@'includedir'@!$(includedir)!g;                               \
+                       s!@'libflags"@!$${libflags}$(pkgconf_LIBFLAGS)!g;"'             \
+                       s!@'incflags"@!$${incflags}$(pkgconf_INCFLAGS)!g;"'             \
+                       s!@'pkgincflags"@!$${pkgincflags}$(pkgconf_PKGINCFLAGS)!g;"'    \
+                       s!@'pkgincludedir'@!$(pkgincludedir)!g
+
 @ENSC_USE_GLIBC_FALSE@nodist_lib_glibc_not_enabled_error_a_SOURCES = \
 @ENSC_USE_GLIBC_FALSE@                         lib-glibc-not-enabled-error.c
 
@@ -2707,6 +2924,8 @@ lib/lib_libvserver_a-syscall.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-checkversion.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_a-checkconfig.$(OBJEXT): lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-isdirectory.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-isfile.$(OBJEXT): lib/$(am__dirstamp) \
@@ -2761,6 +2980,8 @@ lib/lib_libvserver_a-cflags-compat.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-cflags_list-compat.$(OBJEXT):  \
        lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_a-comparevserverbyid.$(OBJEXT):  \
+       lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-createskeleton.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-getvserverbyctx.$(OBJEXT): lib/$(am__dirstamp) \
@@ -2779,6 +3000,8 @@ lib/lib_libvserver_a-getvservervdir.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-xidopt2xid.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_a-nidopt2nid.$(OBJEXT): lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-syscall_rlimit.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-syscall_kill.$(OBJEXT): lib/$(am__dirstamp) \
@@ -2865,6 +3088,18 @@ lib/lib_libvserver_a-syscall_remdlimit.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_a-syscall_setdlimit.$(OBJEXT): lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_a-syscall_rlimitstat.$(OBJEXT):  \
+       lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_a-syscall_resetminmax.$(OBJEXT):  \
+       lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_a-syscall_getvci.$(OBJEXT): lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_a-syscall_virtstat.$(OBJEXT): lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_a-syscall_ctxstat.$(OBJEXT): lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_a-syscall_getspacemask.$(OBJEXT):  \
+       lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
 ensc_fmt/$(am__dirstamp):
        @$(mkdir_p) ensc_fmt
        @: > ensc_fmt/$(am__dirstamp)
@@ -2951,6 +3186,9 @@ lib_internal/lib_internal_libinternal_diet_a-util-exitlikeprocess.$(OBJEXT):  \
 lib_internal/lib_internal_libinternal_diet_a-util-isnumber.$(OBJEXT):  \
        lib_internal/$(am__dirstamp) \
        lib_internal/$(DEPDIR)/$(am__dirstamp)
+lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.$(OBJEXT):  \
+       lib_internal/$(am__dirstamp) \
+       lib_internal/$(DEPDIR)/$(am__dirstamp)
 lib_internal/lib_internal_libinternal_diet_a-util-lockfile.$(OBJEXT):  \
        lib_internal/$(am__dirstamp) \
        lib_internal/$(DEPDIR)/$(am__dirstamp)
@@ -3060,6 +3298,9 @@ lib_internal/lib_internal_libinternal_glibc_a-util-exitlikeprocess.$(OBJEXT):  \
 lib_internal/lib_internal_libinternal_glibc_a-util-isnumber.$(OBJEXT):  \
        lib_internal/$(am__dirstamp) \
        lib_internal/$(DEPDIR)/$(am__dirstamp)
+lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.$(OBJEXT):  \
+       lib_internal/$(am__dirstamp) \
+       lib_internal/$(DEPDIR)/$(am__dirstamp)
 lib_internal/lib_internal_libinternal_glibc_a-util-lockfile.$(OBJEXT):  \
        lib_internal/$(am__dirstamp) \
        lib_internal/$(DEPDIR)/$(am__dirstamp)
@@ -3301,6 +3542,8 @@ lib/lib_libvserver_la-syscall.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-checkversion.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_la-checkconfig.lo: lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-isdirectory.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-isfile.lo: lib/$(am__dirstamp) \
@@ -3355,6 +3598,8 @@ lib/lib_libvserver_la-cflags-compat.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-cflags_list-compat.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_la-comparevserverbyid.lo: lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-createskeleton.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-getvserverbyctx.lo: lib/$(am__dirstamp) \
@@ -3373,6 +3618,8 @@ lib/lib_libvserver_la-getvservervdir.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-xidopt2xid.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_la-nidopt2nid.lo: lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-syscall_rlimit.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-syscall_kill.lo: lib/$(am__dirstamp) \
@@ -3459,6 +3706,18 @@ lib/lib_libvserver_la-syscall_remdlimit.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libvserver_la-syscall_setdlimit.lo: lib/$(am__dirstamp) \
        lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_la-syscall_rlimitstat.lo: lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_la-syscall_resetminmax.lo: lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_la-syscall_getvci.lo: lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_la-syscall_virtstat.lo: lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_la-syscall_ctxstat.lo: lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
+lib/lib_libvserver_la-syscall_getspacemask.lo: lib/$(am__dirstamp) \
+       lib/$(DEPDIR)/$(am__dirstamp)
 ensc_fmt/lib_libvserver_la-fmt-32.lo: ensc_fmt/$(am__dirstamp) \
        ensc_fmt/$(DEPDIR)/$(am__dirstamp)
 ensc_fmt/lib_libvserver_la-fmt-64.lo: ensc_fmt/$(am__dirstamp) \
@@ -3696,12 +3955,24 @@ lib_internal/testsuite/filecfg-ml.$(OBJEXT):  \
 lib_internal/testsuite/filecfg-ml$(EXEEXT): $(lib_internal_testsuite_filecfg_ml_OBJECTS) $(lib_internal_testsuite_filecfg_ml_DEPENDENCIES) lib_internal/testsuite/$(am__dirstamp)
        @rm -f lib_internal/testsuite/filecfg-ml$(EXEEXT)
        $(LINK) $(lib_internal_testsuite_filecfg_ml_LDFLAGS) $(lib_internal_testsuite_filecfg_ml_OBJECTS) $(lib_internal_testsuite_filecfg_ml_LDADD) $(LIBS)
+lib_internal/testsuite/isnumber.$(OBJEXT):  \
+       lib_internal/testsuite/$(am__dirstamp) \
+       lib_internal/testsuite/$(DEPDIR)/$(am__dirstamp)
+lib_internal/testsuite/isnumber$(EXEEXT): $(lib_internal_testsuite_isnumber_OBJECTS) $(lib_internal_testsuite_isnumber_DEPENDENCIES) lib_internal/testsuite/$(am__dirstamp)
+       @rm -f lib_internal/testsuite/isnumber$(EXEEXT)
+       $(LINK) $(lib_internal_testsuite_isnumber_LDFLAGS) $(lib_internal_testsuite_isnumber_OBJECTS) $(lib_internal_testsuite_isnumber_LDADD) $(LIBS)
+lib_internal/testsuite/isnumber-gnu$(EXEEXT): $(lib_internal_testsuite_isnumber_gnu_OBJECTS) $(lib_internal_testsuite_isnumber_gnu_DEPENDENCIES) lib_internal/testsuite/$(am__dirstamp)
+       @rm -f lib_internal/testsuite/isnumber-gnu$(EXEEXT)
+       $(LINK) $(lib_internal_testsuite_isnumber_gnu_LDFLAGS) $(lib_internal_testsuite_isnumber_gnu_OBJECTS) $(lib_internal_testsuite_isnumber_gnu_LDADD) $(LIBS)
 lib_internal/testsuite/sigbus.$(OBJEXT):  \
        lib_internal/testsuite/$(am__dirstamp) \
        lib_internal/testsuite/$(DEPDIR)/$(am__dirstamp)
 lib_internal/testsuite/sigbus$(EXEEXT): $(lib_internal_testsuite_sigbus_OBJECTS) $(lib_internal_testsuite_sigbus_DEPENDENCIES) lib_internal/testsuite/$(am__dirstamp)
        @rm -f lib_internal/testsuite/sigbus$(EXEEXT)
        $(LINK) $(lib_internal_testsuite_sigbus_LDFLAGS) $(lib_internal_testsuite_sigbus_OBJECTS) $(lib_internal_testsuite_sigbus_LDADD) $(LIBS)
+lib_internal/testsuite/sigbus-gnu$(EXEEXT): $(lib_internal_testsuite_sigbus_gnu_OBJECTS) $(lib_internal_testsuite_sigbus_gnu_DEPENDENCIES) lib_internal/testsuite/$(am__dirstamp)
+       @rm -f lib_internal/testsuite/sigbus-gnu$(EXEEXT)
+       $(LINK) $(lib_internal_testsuite_sigbus_gnu_LDFLAGS) $(lib_internal_testsuite_sigbus_gnu_OBJECTS) $(lib_internal_testsuite_sigbus_gnu_LDADD) $(LIBS)
 src/capchroot.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
 src/capchroot$(EXEEXT): $(src_capchroot_OBJECTS) $(src_capchroot_DEPENDENCIES) src/$(am__dirstamp)
@@ -3714,9 +3985,9 @@ src/chain-echo$(EXEEXT): $(src_chain_echo_OBJECTS) $(src_chain_echo_DEPENDENCIES
        $(LINK) $(src_chain_echo_LDFLAGS) $(src_chain_echo_OBJECTS) $(src_chain_echo_LDADD) $(LIBS)
 src/chbind.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
-src/chbind$(EXEEXT): $(src_chbind_OBJECTS) $(src_chbind_DEPENDENCIES) src/$(am__dirstamp)
-       @rm -f src/chbind$(EXEEXT)
-       $(LINK) $(src_chbind_LDFLAGS) $(src_chbind_OBJECTS) $(src_chbind_LDADD) $(LIBS)
+src/chbind-compat$(EXEEXT): $(src_chbind_compat_OBJECTS) $(src_chbind_compat_DEPENDENCIES) src/$(am__dirstamp)
+       @rm -f src/chbind-compat$(EXEEXT)
+       $(LINK) $(src_chbind_compat_LDFLAGS) $(src_chbind_compat_OBJECTS) $(src_chbind_compat_LDADD) $(LIBS)
 src/chcontext.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
 src/chcontext-compat$(EXEEXT): $(src_chcontext_compat_OBJECTS) $(src_chcontext_compat_DEPENDENCIES) src/$(am__dirstamp)
@@ -3787,6 +4058,21 @@ src/mask2prefix.$(OBJEXT): src/$(am__dirstamp) \
 src/mask2prefix$(EXEEXT): $(src_mask2prefix_OBJECTS) $(src_mask2prefix_DEPENDENCIES) src/$(am__dirstamp)
        @rm -f src/mask2prefix$(EXEEXT)
        $(LINK) $(src_mask2prefix_LDFLAGS) $(src_mask2prefix_OBJECTS) $(src_mask2prefix_LDADD) $(LIBS)
+src/naddress.$(OBJEXT): src/$(am__dirstamp) \
+       src/$(DEPDIR)/$(am__dirstamp)
+src/naddress$(EXEEXT): $(src_naddress_OBJECTS) $(src_naddress_DEPENDENCIES) src/$(am__dirstamp)
+       @rm -f src/naddress$(EXEEXT)
+       $(LINK) $(src_naddress_LDFLAGS) $(src_naddress_OBJECTS) $(src_naddress_LDADD) $(LIBS)
+src/nattribute.$(OBJEXT): src/$(am__dirstamp) \
+       src/$(DEPDIR)/$(am__dirstamp)
+src/nattribute$(EXEEXT): $(src_nattribute_OBJECTS) $(src_nattribute_DEPENDENCIES) src/$(am__dirstamp)
+       @rm -f src/nattribute$(EXEEXT)
+       $(LINK) $(src_nattribute_LDFLAGS) $(src_nattribute_OBJECTS) $(src_nattribute_LDADD) $(LIBS)
+src/ncontext.$(OBJEXT): src/$(am__dirstamp) \
+       src/$(DEPDIR)/$(am__dirstamp)
+src/ncontext$(EXEEXT): $(src_ncontext_OBJECTS) $(src_ncontext_DEPENDENCIES) src/$(am__dirstamp)
+       @rm -f src/ncontext$(EXEEXT)
+       $(LINK) $(src_ncontext_LDFLAGS) $(src_ncontext_OBJECTS) $(src_ncontext_LDADD) $(LIBS)
 src/parserpmdump.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
 src/parserpmdump$(EXEEXT): $(src_parserpmdump_OBJECTS) $(src_parserpmdump_DEPENDENCIES) src/$(am__dirstamp)
@@ -3858,6 +4144,16 @@ src/testsuite/chcontext-test.$(OBJEXT): src/testsuite/$(am__dirstamp) \
 src/testsuite/chcontext-test$(EXEEXT): $(src_testsuite_chcontext_test_OBJECTS) $(src_testsuite_chcontext_test_DEPENDENCIES) src/testsuite/$(am__dirstamp)
        @rm -f src/testsuite/chcontext-test$(EXEEXT)
        $(LINK) $(src_testsuite_chcontext_test_LDFLAGS) $(src_testsuite_chcontext_test_OBJECTS) $(src_testsuite_chcontext_test_LDADD) $(LIBS)
+src/testsuite/hashcalc.$(OBJEXT): src/testsuite/$(am__dirstamp) \
+       src/testsuite/$(DEPDIR)/$(am__dirstamp)
+src/testsuite/hashcalc$(EXEEXT): $(src_testsuite_hashcalc_OBJECTS) $(src_testsuite_hashcalc_DEPENDENCIES) src/testsuite/$(am__dirstamp)
+       @rm -f src/testsuite/hashcalc$(EXEEXT)
+       $(LINK) $(src_testsuite_hashcalc_LDFLAGS) $(src_testsuite_hashcalc_OBJECTS) $(src_testsuite_hashcalc_LDADD) $(LIBS)
+src/testsuite/hashcalc-plain.$(OBJEXT): src/testsuite/$(am__dirstamp) \
+       src/testsuite/$(DEPDIR)/$(am__dirstamp)
+src/testsuite/hashcalc-plain$(EXEEXT): $(src_testsuite_hashcalc_plain_OBJECTS) $(src_testsuite_hashcalc_plain_DEPENDENCIES) src/testsuite/$(am__dirstamp)
+       @rm -f src/testsuite/hashcalc-plain$(EXEEXT)
+       $(LINK) $(src_testsuite_hashcalc_plain_LDFLAGS) $(src_testsuite_hashcalc_plain_OBJECTS) $(src_testsuite_hashcalc_plain_LDADD) $(LIBS)
 src/testsuite/rpm-fake-test.$(OBJEXT): src/testsuite/$(am__dirstamp) \
        src/testsuite/$(DEPDIR)/$(am__dirstamp)
 src/testsuite/rpm-fake-test$(EXEEXT): $(src_testsuite_rpm_fake_test_OBJECTS) $(src_testsuite_rpm_fake_test_DEPENDENCIES) src/testsuite/$(am__dirstamp)
@@ -3884,6 +4180,8 @@ src/vbuild$(EXEEXT): $(src_vbuild_OBJECTS) $(src_vbuild_DEPENDENCIES) src/$(am__
        $(CXXLINK) $(src_vbuild_LDFLAGS) $(src_vbuild_OBJECTS) $(src_vbuild_LDADD) $(LIBS)
 src/vcontext.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
+src/vlogin.$(OBJEXT): src/$(am__dirstamp) \
+       src/$(DEPDIR)/$(am__dirstamp)
 src/vcontext$(EXEEXT): $(src_vcontext_OBJECTS) $(src_vcontext_DEPENDENCIES) src/$(am__dirstamp)
        @rm -f src/vcontext$(EXEEXT)
        $(LINK) $(src_vcontext_LDFLAGS) $(src_vcontext_OBJECTS) $(src_vcontext_LDADD) $(LIBS)
@@ -4257,7 +4555,9 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_a-cflags-v13.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-cflags_list-compat.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-cflags_list-v13.$(OBJEXT)
+       -rm -f lib/lib_libvserver_a-checkconfig.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-checkversion.$(OBJEXT)
+       -rm -f lib/lib_libvserver_a-comparevserverbyid.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-createskeleton.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-getfilecontext.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-getinsecurebcaps.$(OBJEXT)
@@ -4284,6 +4584,7 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_a-ncaps_list-net.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-nflags-net.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-nflags_list-net.$(OBJEXT)
+       -rm -f lib/lib_libvserver_a-nidopt2nid.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-parselimit.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-personalityflag.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-personalityflag_list.$(OBJEXT)
@@ -4295,6 +4596,7 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_a-syscall_cleanupnamespace.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_ctxcreate.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_ctxmigrate.$(OBJEXT)
+       -rm -f lib/lib_libvserver_a-syscall_ctxstat.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_enternamespace.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_getccaps.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_getcflags.$(OBJEXT)
@@ -4303,8 +4605,10 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_a-syscall_getncaps.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_getnflags.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_getnxinfo.$(OBJEXT)
+       -rm -f lib/lib_libvserver_a-syscall_getspacemask.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_gettasknid.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_gettaskxid.$(OBJEXT)
+       -rm -f lib/lib_libvserver_a-syscall_getvci.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_getvhiname.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_getvxinfo.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_kill.$(OBJEXT)
@@ -4313,7 +4617,9 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_a-syscall_netmigrate.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_netremove.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_remdlimit.$(OBJEXT)
+       -rm -f lib/lib_libvserver_a-syscall_resetminmax.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_rlimit.$(OBJEXT)
+       -rm -f lib/lib_libvserver_a-syscall_rlimitstat.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_setccaps.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_setcflags.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_setdlimit.$(OBJEXT)
@@ -4323,6 +4629,7 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_a-syscall_setnflags.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_setsched.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_setvhiname.$(OBJEXT)
+       -rm -f lib/lib_libvserver_a-syscall_virtstat.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-syscall_waitexit.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-val2text-t2v-uint32.$(OBJEXT)
        -rm -f lib/lib_libvserver_a-val2text-t2v-uint64.$(OBJEXT)
@@ -4347,8 +4654,12 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_la-cflags_list-compat.lo
        -rm -f lib/lib_libvserver_la-cflags_list-v13.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-cflags_list-v13.lo
+       -rm -f lib/lib_libvserver_la-checkconfig.$(OBJEXT)
+       -rm -f lib/lib_libvserver_la-checkconfig.lo
        -rm -f lib/lib_libvserver_la-checkversion.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-checkversion.lo
+       -rm -f lib/lib_libvserver_la-comparevserverbyid.$(OBJEXT)
+       -rm -f lib/lib_libvserver_la-comparevserverbyid.lo
        -rm -f lib/lib_libvserver_la-createskeleton.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-createskeleton.lo
        -rm -f lib/lib_libvserver_la-getfilecontext.$(OBJEXT)
@@ -4401,6 +4712,8 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_la-nflags-net.lo
        -rm -f lib/lib_libvserver_la-nflags_list-net.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-nflags_list-net.lo
+       -rm -f lib/lib_libvserver_la-nidopt2nid.$(OBJEXT)
+       -rm -f lib/lib_libvserver_la-nidopt2nid.lo
        -rm -f lib/lib_libvserver_la-parselimit.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-parselimit.lo
        -rm -f lib/lib_libvserver_la-personalityflag.$(OBJEXT)
@@ -4423,6 +4736,8 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_la-syscall_ctxcreate.lo
        -rm -f lib/lib_libvserver_la-syscall_ctxmigrate.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_ctxmigrate.lo
+       -rm -f lib/lib_libvserver_la-syscall_ctxstat.$(OBJEXT)
+       -rm -f lib/lib_libvserver_la-syscall_ctxstat.lo
        -rm -f lib/lib_libvserver_la-syscall_enternamespace.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_enternamespace.lo
        -rm -f lib/lib_libvserver_la-syscall_getccaps.$(OBJEXT)
@@ -4439,10 +4754,14 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_la-syscall_getnflags.lo
        -rm -f lib/lib_libvserver_la-syscall_getnxinfo.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_getnxinfo.lo
+       -rm -f lib/lib_libvserver_la-syscall_getspacemask.$(OBJEXT)
+       -rm -f lib/lib_libvserver_la-syscall_getspacemask.lo
        -rm -f lib/lib_libvserver_la-syscall_gettasknid.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_gettasknid.lo
        -rm -f lib/lib_libvserver_la-syscall_gettaskxid.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_gettaskxid.lo
+       -rm -f lib/lib_libvserver_la-syscall_getvci.$(OBJEXT)
+       -rm -f lib/lib_libvserver_la-syscall_getvci.lo
        -rm -f lib/lib_libvserver_la-syscall_getvhiname.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_getvhiname.lo
        -rm -f lib/lib_libvserver_la-syscall_getvxinfo.$(OBJEXT)
@@ -4459,8 +4778,12 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_la-syscall_netremove.lo
        -rm -f lib/lib_libvserver_la-syscall_remdlimit.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_remdlimit.lo
+       -rm -f lib/lib_libvserver_la-syscall_resetminmax.$(OBJEXT)
+       -rm -f lib/lib_libvserver_la-syscall_resetminmax.lo
        -rm -f lib/lib_libvserver_la-syscall_rlimit.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_rlimit.lo
+       -rm -f lib/lib_libvserver_la-syscall_rlimitstat.$(OBJEXT)
+       -rm -f lib/lib_libvserver_la-syscall_rlimitstat.lo
        -rm -f lib/lib_libvserver_la-syscall_setccaps.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_setccaps.lo
        -rm -f lib/lib_libvserver_la-syscall_setcflags.$(OBJEXT)
@@ -4479,6 +4802,8 @@ mostlyclean-compile:
        -rm -f lib/lib_libvserver_la-syscall_setsched.lo
        -rm -f lib/lib_libvserver_la-syscall_setvhiname.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_setvhiname.lo
+       -rm -f lib/lib_libvserver_la-syscall_virtstat.$(OBJEXT)
+       -rm -f lib/lib_libvserver_la-syscall_virtstat.lo
        -rm -f lib/lib_libvserver_la-syscall_waitexit.$(OBJEXT)
        -rm -f lib/lib_libvserver_la-syscall_waitexit.lo
        -rm -f lib/lib_libvserver_la-val2text-t2v-uint32.$(OBJEXT)
@@ -4528,6 +4853,7 @@ mostlyclean-compile:
        -rm -f lib_internal/lib_internal_libinternal_diet_a-util-canonify.$(OBJEXT)
        -rm -f lib_internal/lib_internal_libinternal_diet_a-util-exitlikeprocess.$(OBJEXT)
        -rm -f lib_internal/lib_internal_libinternal_diet_a-util-isnumber.$(OBJEXT)
+       -rm -f lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.$(OBJEXT)
        -rm -f lib_internal/lib_internal_libinternal_diet_a-util-lockfile.$(OBJEXT)
        -rm -f lib_internal/lib_internal_libinternal_diet_a-util-safechdir.$(OBJEXT)
        -rm -f lib_internal/lib_internal_libinternal_glibc_a-command-appendparameter.$(OBJEXT)
@@ -4563,11 +4889,13 @@ mostlyclean-compile:
        -rm -f lib_internal/lib_internal_libinternal_glibc_a-util-canonify.$(OBJEXT)
        -rm -f lib_internal/lib_internal_libinternal_glibc_a-util-exitlikeprocess.$(OBJEXT)
        -rm -f lib_internal/lib_internal_libinternal_glibc_a-util-isnumber.$(OBJEXT)
+       -rm -f lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.$(OBJEXT)
        -rm -f lib_internal/lib_internal_libinternal_glibc_a-util-lockfile.$(OBJEXT)
        -rm -f lib_internal/lib_internal_libinternal_glibc_a-util-safechdir.$(OBJEXT)
        -rm -f lib_internal/testsuite/command.$(OBJEXT)
        -rm -f lib_internal/testsuite/copy.$(OBJEXT)
        -rm -f lib_internal/testsuite/filecfg-ml.$(OBJEXT)
+       -rm -f lib_internal/testsuite/isnumber.$(OBJEXT)
        -rm -f lib_internal/testsuite/sigbus.$(OBJEXT)
        -rm -f src/capchroot.$(OBJEXT)
        -rm -f src/chain-echo.$(OBJEXT)
@@ -4587,6 +4915,9 @@ mostlyclean-compile:
        -rm -f src/lockfile.$(OBJEXT)
        -rm -f src/lsxid.$(OBJEXT)
        -rm -f src/mask2prefix.$(OBJEXT)
+       -rm -f src/naddress.$(OBJEXT)
+       -rm -f src/nattribute.$(OBJEXT)
+       -rm -f src/ncontext.$(OBJEXT)
        -rm -f src/parserpmdump.$(OBJEXT)
        -rm -f src/readlink.$(OBJEXT)
        -rm -f src/rebootmgr.$(OBJEXT)
@@ -4603,6 +4934,8 @@ mostlyclean-compile:
        -rm -f src/src_vkill-vkill.$(OBJEXT)
        -rm -f src/testsuite/chbind-test.$(OBJEXT)
        -rm -f src/testsuite/chcontext-test.$(OBJEXT)
+       -rm -f src/testsuite/hashcalc-plain.$(OBJEXT)
+       -rm -f src/testsuite/hashcalc.$(OBJEXT)
        -rm -f src/testsuite/rpm-fake-test.$(OBJEXT)
        -rm -f src/testsuite/src_testsuite_vunify_functest-vunify-functest.$(OBJEXT)
        -rm -f src/vattribute.$(OBJEXT)
@@ -4613,6 +4946,7 @@ mostlyclean-compile:
        -rm -f src/vdu.$(OBJEXT)
        -rm -f src/vhashify.$(OBJEXT)
        -rm -f src/vlimit.$(OBJEXT)
+       -rm -f src/vlogin.$(OBJEXT)
        -rm -f src/vnamespace.$(OBJEXT)
        -rm -f src/vps.$(OBJEXT)
        -rm -f src/vreboot.$(OBJEXT)
@@ -4715,7 +5049,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-cflags-v13.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-cflags_list-compat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-cflags_list-v13.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-checkversion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-createskeleton.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-getfilecontext.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-getinsecurebcaps.Po@am__quote@
@@ -4742,6 +5078,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-ncaps_list-net.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-nflags-net.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-nflags_list-net.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-parselimit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-personalityflag.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-personalityflag_list.Po@am__quote@
@@ -4753,6 +5090,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_cleanupnamespace.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxcreate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxmigrate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_enternamespace.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_getccaps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_getcflags.Po@am__quote@
@@ -4761,8 +5099,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_getncaps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_getnflags.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_getnxinfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_gettasknid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_gettaskxid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_getvhiname.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_getvxinfo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_kill.Po@am__quote@
@@ -4771,7 +5111,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_netmigrate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_netremove.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_remdlimit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_setccaps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_setcflags.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_setdlimit.Po@am__quote@
@@ -4781,6 +5123,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_setnflags.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_setsched.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_setvhiname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-syscall_waitexit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-val2text-t2v-uint32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_a-val2text-t2v-uint64.Po@am__quote@
@@ -4796,7 +5139,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-cflags-v13.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-cflags_list-compat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-cflags_list-v13.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-checkversion.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-createskeleton.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-getfilecontext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-getinsecurebcaps.Plo@am__quote@
@@ -4823,6 +5168,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-ncaps_list-net.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-nflags-net.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-nflags_list-net.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-parselimit.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-personalityflag.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-personalityflag_list.Plo@am__quote@
@@ -4834,6 +5180,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_cleanupnamespace.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxcreate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxmigrate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_enternamespace.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_getccaps.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_getcflags.Plo@am__quote@
@@ -4842,8 +5189,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_getncaps.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_getnflags.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_getnxinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_gettasknid.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_gettaskxid.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_getvhiname.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_getvxinfo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_kill.Plo@am__quote@
@@ -4852,7 +5201,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_netmigrate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_netremove.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_remdlimit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_setccaps.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_setcflags.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_setdlimit.Plo@am__quote@
@@ -4862,6 +5213,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_setnflags.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_setsched.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_setvhiname.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-syscall_waitexit.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-val2text-t2v-uint32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/lib_libvserver_la-val2text-t2v-uint64.Plo@am__quote@
@@ -4905,6 +5257,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-canonify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-exitlikeprocess.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumber.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-lockfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-safechdir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-command-appendparameter.Po@am__quote@
@@ -4940,11 +5293,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-canonify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-exitlikeprocess.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumber.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-lockfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-safechdir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/testsuite/$(DEPDIR)/command.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/testsuite/$(DEPDIR)/copy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/testsuite/$(DEPDIR)/filecfg-ml.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib_internal/testsuite/$(DEPDIR)/isnumber.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib_internal/testsuite/$(DEPDIR)/sigbus.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/capchroot.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chain-echo.Po@am__quote@
@@ -4964,6 +5319,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lockfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lsxid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mask2prefix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/naddress.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/nattribute.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ncontext.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/parserpmdump.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/readlink.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/rebootmgr.Po@am__quote@
@@ -4985,6 +5343,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vdu.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vhashify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vlimit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vlogin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vnamespace.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vreboot.Po@am__quote@
@@ -5001,6 +5360,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vwait.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/testsuite/$(DEPDIR)/chbind-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/testsuite/$(DEPDIR)/chcontext-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/testsuite/$(DEPDIR)/hashcalc-plain.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/testsuite/$(DEPDIR)/hashcalc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/testsuite/$(DEPDIR)/rpm-fake-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/testsuite/$(DEPDIR)/src_testsuite_vunify_functest-vunify-functest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/escaperoot.Po@am__quote@
@@ -5097,6 +5458,30 @@ lib/lib_libvserver_a-checkversion.lo: lib/checkversion.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-checkversion.lo `test -f 'lib/checkversion.c' || echo '$(srcdir)/'`lib/checkversion.c
 
+lib/lib_libvserver_a-checkconfig.o: lib/checkconfig.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-checkconfig.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Tpo" -c -o lib/lib_libvserver_a-checkconfig.o `test -f 'lib/checkconfig.c' || echo '$(srcdir)/'`lib/checkconfig.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/checkconfig.c' object='lib/lib_libvserver_a-checkconfig.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-checkconfig.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-checkconfig.o `test -f 'lib/checkconfig.c' || echo '$(srcdir)/'`lib/checkconfig.c
+
+lib/lib_libvserver_a-checkconfig.obj: lib/checkconfig.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-checkconfig.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Tpo" -c -o lib/lib_libvserver_a-checkconfig.obj `if test -f 'lib/checkconfig.c'; then $(CYGPATH_W) 'lib/checkconfig.c'; else $(CYGPATH_W) '$(srcdir)/lib/checkconfig.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/checkconfig.c' object='lib/lib_libvserver_a-checkconfig.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-checkconfig.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-checkconfig.obj `if test -f 'lib/checkconfig.c'; then $(CYGPATH_W) 'lib/checkconfig.c'; else $(CYGPATH_W) '$(srcdir)/lib/checkconfig.c'; fi`
+
+lib/lib_libvserver_a-checkconfig.lo: lib/checkconfig.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-checkconfig.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Tpo" -c -o lib/lib_libvserver_a-checkconfig.lo `test -f 'lib/checkconfig.c' || echo '$(srcdir)/'`lib/checkconfig.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/checkconfig.c' object='lib/lib_libvserver_a-checkconfig.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-checkconfig.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-checkconfig.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-checkconfig.lo `test -f 'lib/checkconfig.c' || echo '$(srcdir)/'`lib/checkconfig.c
+
 lib/lib_libvserver_a-isdirectory.o: lib/isdirectory.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-isdirectory.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-isdirectory.Tpo" -c -o lib/lib_libvserver_a-isdirectory.o `test -f 'lib/isdirectory.c' || echo '$(srcdir)/'`lib/isdirectory.c; \
 @am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-isdirectory.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-isdirectory.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-isdirectory.Tpo"; exit 1; fi
@@ -5745,6 +6130,30 @@ lib/lib_libvserver_a-cflags_list-compat.lo: lib/cflags_list-compat.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-cflags_list-compat.lo `test -f 'lib/cflags_list-compat.c' || echo '$(srcdir)/'`lib/cflags_list-compat.c
 
+lib/lib_libvserver_a-comparevserverbyid.o: lib/comparevserverbyid.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-comparevserverbyid.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Tpo" -c -o lib/lib_libvserver_a-comparevserverbyid.o `test -f 'lib/comparevserverbyid.c' || echo '$(srcdir)/'`lib/comparevserverbyid.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/comparevserverbyid.c' object='lib/lib_libvserver_a-comparevserverbyid.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-comparevserverbyid.o `test -f 'lib/comparevserverbyid.c' || echo '$(srcdir)/'`lib/comparevserverbyid.c
+
+lib/lib_libvserver_a-comparevserverbyid.obj: lib/comparevserverbyid.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-comparevserverbyid.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Tpo" -c -o lib/lib_libvserver_a-comparevserverbyid.obj `if test -f 'lib/comparevserverbyid.c'; then $(CYGPATH_W) 'lib/comparevserverbyid.c'; else $(CYGPATH_W) '$(srcdir)/lib/comparevserverbyid.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/comparevserverbyid.c' object='lib/lib_libvserver_a-comparevserverbyid.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-comparevserverbyid.obj `if test -f 'lib/comparevserverbyid.c'; then $(CYGPATH_W) 'lib/comparevserverbyid.c'; else $(CYGPATH_W) '$(srcdir)/lib/comparevserverbyid.c'; fi`
+
+lib/lib_libvserver_a-comparevserverbyid.lo: lib/comparevserverbyid.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-comparevserverbyid.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Tpo" -c -o lib/lib_libvserver_a-comparevserverbyid.lo `test -f 'lib/comparevserverbyid.c' || echo '$(srcdir)/'`lib/comparevserverbyid.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/comparevserverbyid.c' object='lib/lib_libvserver_a-comparevserverbyid.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-comparevserverbyid.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-comparevserverbyid.lo `test -f 'lib/comparevserverbyid.c' || echo '$(srcdir)/'`lib/comparevserverbyid.c
+
 lib/lib_libvserver_a-createskeleton.o: lib/createskeleton.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-createskeleton.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-createskeleton.Tpo" -c -o lib/lib_libvserver_a-createskeleton.o `test -f 'lib/createskeleton.c' || echo '$(srcdir)/'`lib/createskeleton.c; \
 @am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-createskeleton.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-createskeleton.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-createskeleton.Tpo"; exit 1; fi
@@ -5961,6 +6370,30 @@ lib/lib_libvserver_a-xidopt2xid.lo: lib/xidopt2xid.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-xidopt2xid.lo `test -f 'lib/xidopt2xid.c' || echo '$(srcdir)/'`lib/xidopt2xid.c
 
+lib/lib_libvserver_a-nidopt2nid.o: lib/nidopt2nid.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-nidopt2nid.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Tpo" -c -o lib/lib_libvserver_a-nidopt2nid.o `test -f 'lib/nidopt2nid.c' || echo '$(srcdir)/'`lib/nidopt2nid.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/nidopt2nid.c' object='lib/lib_libvserver_a-nidopt2nid.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-nidopt2nid.o `test -f 'lib/nidopt2nid.c' || echo '$(srcdir)/'`lib/nidopt2nid.c
+
+lib/lib_libvserver_a-nidopt2nid.obj: lib/nidopt2nid.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-nidopt2nid.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Tpo" -c -o lib/lib_libvserver_a-nidopt2nid.obj `if test -f 'lib/nidopt2nid.c'; then $(CYGPATH_W) 'lib/nidopt2nid.c'; else $(CYGPATH_W) '$(srcdir)/lib/nidopt2nid.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/nidopt2nid.c' object='lib/lib_libvserver_a-nidopt2nid.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-nidopt2nid.obj `if test -f 'lib/nidopt2nid.c'; then $(CYGPATH_W) 'lib/nidopt2nid.c'; else $(CYGPATH_W) '$(srcdir)/lib/nidopt2nid.c'; fi`
+
+lib/lib_libvserver_a-nidopt2nid.lo: lib/nidopt2nid.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-nidopt2nid.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Tpo" -c -o lib/lib_libvserver_a-nidopt2nid.lo `test -f 'lib/nidopt2nid.c' || echo '$(srcdir)/'`lib/nidopt2nid.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/nidopt2nid.c' object='lib/lib_libvserver_a-nidopt2nid.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-nidopt2nid.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-nidopt2nid.lo `test -f 'lib/nidopt2nid.c' || echo '$(srcdir)/'`lib/nidopt2nid.c
+
 lib/lib_libvserver_a-syscall_rlimit.o: lib/syscall_rlimit.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_rlimit.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimit.Tpo" -c -o lib/lib_libvserver_a-syscall_rlimit.o `test -f 'lib/syscall_rlimit.c' || echo '$(srcdir)/'`lib/syscall_rlimit.c; \
 @am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimit.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimit.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimit.Tpo"; exit 1; fi
@@ -6993,6 +7426,150 @@ lib/lib_libvserver_a-syscall_setdlimit.lo: lib/syscall_setdlimit.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_setdlimit.lo `test -f 'lib/syscall_setdlimit.c' || echo '$(srcdir)/'`lib/syscall_setdlimit.c
 
+lib/lib_libvserver_a-syscall_rlimitstat.o: lib/syscall_rlimitstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_rlimitstat.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Tpo" -c -o lib/lib_libvserver_a-syscall_rlimitstat.o `test -f 'lib/syscall_rlimitstat.c' || echo '$(srcdir)/'`lib/syscall_rlimitstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_rlimitstat.c' object='lib/lib_libvserver_a-syscall_rlimitstat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_rlimitstat.o `test -f 'lib/syscall_rlimitstat.c' || echo '$(srcdir)/'`lib/syscall_rlimitstat.c
+
+lib/lib_libvserver_a-syscall_rlimitstat.obj: lib/syscall_rlimitstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_rlimitstat.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Tpo" -c -o lib/lib_libvserver_a-syscall_rlimitstat.obj `if test -f 'lib/syscall_rlimitstat.c'; then $(CYGPATH_W) 'lib/syscall_rlimitstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_rlimitstat.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_rlimitstat.c' object='lib/lib_libvserver_a-syscall_rlimitstat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_rlimitstat.obj `if test -f 'lib/syscall_rlimitstat.c'; then $(CYGPATH_W) 'lib/syscall_rlimitstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_rlimitstat.c'; fi`
+
+lib/lib_libvserver_a-syscall_rlimitstat.lo: lib/syscall_rlimitstat.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_rlimitstat.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Tpo" -c -o lib/lib_libvserver_a-syscall_rlimitstat.lo `test -f 'lib/syscall_rlimitstat.c' || echo '$(srcdir)/'`lib/syscall_rlimitstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_rlimitstat.c' object='lib/lib_libvserver_a-syscall_rlimitstat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_rlimitstat.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_rlimitstat.lo `test -f 'lib/syscall_rlimitstat.c' || echo '$(srcdir)/'`lib/syscall_rlimitstat.c
+
+lib/lib_libvserver_a-syscall_resetminmax.o: lib/syscall_resetminmax.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_resetminmax.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Tpo" -c -o lib/lib_libvserver_a-syscall_resetminmax.o `test -f 'lib/syscall_resetminmax.c' || echo '$(srcdir)/'`lib/syscall_resetminmax.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_resetminmax.c' object='lib/lib_libvserver_a-syscall_resetminmax.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_resetminmax.o `test -f 'lib/syscall_resetminmax.c' || echo '$(srcdir)/'`lib/syscall_resetminmax.c
+
+lib/lib_libvserver_a-syscall_resetminmax.obj: lib/syscall_resetminmax.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_resetminmax.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Tpo" -c -o lib/lib_libvserver_a-syscall_resetminmax.obj `if test -f 'lib/syscall_resetminmax.c'; then $(CYGPATH_W) 'lib/syscall_resetminmax.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_resetminmax.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_resetminmax.c' object='lib/lib_libvserver_a-syscall_resetminmax.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_resetminmax.obj `if test -f 'lib/syscall_resetminmax.c'; then $(CYGPATH_W) 'lib/syscall_resetminmax.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_resetminmax.c'; fi`
+
+lib/lib_libvserver_a-syscall_resetminmax.lo: lib/syscall_resetminmax.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_resetminmax.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Tpo" -c -o lib/lib_libvserver_a-syscall_resetminmax.lo `test -f 'lib/syscall_resetminmax.c' || echo '$(srcdir)/'`lib/syscall_resetminmax.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_resetminmax.c' object='lib/lib_libvserver_a-syscall_resetminmax.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_resetminmax.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_resetminmax.lo `test -f 'lib/syscall_resetminmax.c' || echo '$(srcdir)/'`lib/syscall_resetminmax.c
+
+lib/lib_libvserver_a-syscall_getvci.o: lib/syscall_getvci.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_getvci.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Tpo" -c -o lib/lib_libvserver_a-syscall_getvci.o `test -f 'lib/syscall_getvci.c' || echo '$(srcdir)/'`lib/syscall_getvci.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getvci.c' object='lib/lib_libvserver_a-syscall_getvci.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_getvci.o `test -f 'lib/syscall_getvci.c' || echo '$(srcdir)/'`lib/syscall_getvci.c
+
+lib/lib_libvserver_a-syscall_getvci.obj: lib/syscall_getvci.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_getvci.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Tpo" -c -o lib/lib_libvserver_a-syscall_getvci.obj `if test -f 'lib/syscall_getvci.c'; then $(CYGPATH_W) 'lib/syscall_getvci.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_getvci.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getvci.c' object='lib/lib_libvserver_a-syscall_getvci.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_getvci.obj `if test -f 'lib/syscall_getvci.c'; then $(CYGPATH_W) 'lib/syscall_getvci.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_getvci.c'; fi`
+
+lib/lib_libvserver_a-syscall_getvci.lo: lib/syscall_getvci.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_getvci.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Tpo" -c -o lib/lib_libvserver_a-syscall_getvci.lo `test -f 'lib/syscall_getvci.c' || echo '$(srcdir)/'`lib/syscall_getvci.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getvci.c' object='lib/lib_libvserver_a-syscall_getvci.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getvci.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_getvci.lo `test -f 'lib/syscall_getvci.c' || echo '$(srcdir)/'`lib/syscall_getvci.c
+
+lib/lib_libvserver_a-syscall_virtstat.o: lib/syscall_virtstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_virtstat.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Tpo" -c -o lib/lib_libvserver_a-syscall_virtstat.o `test -f 'lib/syscall_virtstat.c' || echo '$(srcdir)/'`lib/syscall_virtstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_virtstat.c' object='lib/lib_libvserver_a-syscall_virtstat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_virtstat.o `test -f 'lib/syscall_virtstat.c' || echo '$(srcdir)/'`lib/syscall_virtstat.c
+
+lib/lib_libvserver_a-syscall_virtstat.obj: lib/syscall_virtstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_virtstat.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Tpo" -c -o lib/lib_libvserver_a-syscall_virtstat.obj `if test -f 'lib/syscall_virtstat.c'; then $(CYGPATH_W) 'lib/syscall_virtstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_virtstat.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_virtstat.c' object='lib/lib_libvserver_a-syscall_virtstat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_virtstat.obj `if test -f 'lib/syscall_virtstat.c'; then $(CYGPATH_W) 'lib/syscall_virtstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_virtstat.c'; fi`
+
+lib/lib_libvserver_a-syscall_virtstat.lo: lib/syscall_virtstat.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_virtstat.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Tpo" -c -o lib/lib_libvserver_a-syscall_virtstat.lo `test -f 'lib/syscall_virtstat.c' || echo '$(srcdir)/'`lib/syscall_virtstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_virtstat.c' object='lib/lib_libvserver_a-syscall_virtstat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_virtstat.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_virtstat.lo `test -f 'lib/syscall_virtstat.c' || echo '$(srcdir)/'`lib/syscall_virtstat.c
+
+lib/lib_libvserver_a-syscall_ctxstat.o: lib/syscall_ctxstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_ctxstat.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Tpo" -c -o lib/lib_libvserver_a-syscall_ctxstat.o `test -f 'lib/syscall_ctxstat.c' || echo '$(srcdir)/'`lib/syscall_ctxstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_ctxstat.c' object='lib/lib_libvserver_a-syscall_ctxstat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_ctxstat.o `test -f 'lib/syscall_ctxstat.c' || echo '$(srcdir)/'`lib/syscall_ctxstat.c
+
+lib/lib_libvserver_a-syscall_ctxstat.obj: lib/syscall_ctxstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_ctxstat.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Tpo" -c -o lib/lib_libvserver_a-syscall_ctxstat.obj `if test -f 'lib/syscall_ctxstat.c'; then $(CYGPATH_W) 'lib/syscall_ctxstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_ctxstat.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_ctxstat.c' object='lib/lib_libvserver_a-syscall_ctxstat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_ctxstat.obj `if test -f 'lib/syscall_ctxstat.c'; then $(CYGPATH_W) 'lib/syscall_ctxstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_ctxstat.c'; fi`
+
+lib/lib_libvserver_a-syscall_ctxstat.lo: lib/syscall_ctxstat.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_ctxstat.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Tpo" -c -o lib/lib_libvserver_a-syscall_ctxstat.lo `test -f 'lib/syscall_ctxstat.c' || echo '$(srcdir)/'`lib/syscall_ctxstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_ctxstat.c' object='lib/lib_libvserver_a-syscall_ctxstat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_ctxstat.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_ctxstat.lo `test -f 'lib/syscall_ctxstat.c' || echo '$(srcdir)/'`lib/syscall_ctxstat.c
+
+lib/lib_libvserver_a-syscall_getspacemask.o: lib/syscall_getspacemask.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_getspacemask.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Tpo" -c -o lib/lib_libvserver_a-syscall_getspacemask.o `test -f 'lib/syscall_getspacemask.c' || echo '$(srcdir)/'`lib/syscall_getspacemask.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getspacemask.c' object='lib/lib_libvserver_a-syscall_getspacemask.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_getspacemask.o `test -f 'lib/syscall_getspacemask.c' || echo '$(srcdir)/'`lib/syscall_getspacemask.c
+
+lib/lib_libvserver_a-syscall_getspacemask.obj: lib/syscall_getspacemask.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_getspacemask.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Tpo" -c -o lib/lib_libvserver_a-syscall_getspacemask.obj `if test -f 'lib/syscall_getspacemask.c'; then $(CYGPATH_W) 'lib/syscall_getspacemask.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_getspacemask.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getspacemask.c' object='lib/lib_libvserver_a-syscall_getspacemask.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_getspacemask.obj `if test -f 'lib/syscall_getspacemask.c'; then $(CYGPATH_W) 'lib/syscall_getspacemask.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_getspacemask.c'; fi`
+
+lib/lib_libvserver_a-syscall_getspacemask.lo: lib/syscall_getspacemask.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_a-syscall_getspacemask.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Tpo" -c -o lib/lib_libvserver_a-syscall_getspacemask.lo `test -f 'lib/syscall_getspacemask.c' || echo '$(srcdir)/'`lib/syscall_getspacemask.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Tpo" "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getspacemask.c' object='lib/lib_libvserver_a-syscall_getspacemask.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_a-syscall_getspacemask.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_a-syscall_getspacemask.lo `test -f 'lib/syscall_getspacemask.c' || echo '$(srcdir)/'`lib/syscall_getspacemask.c
+
 ensc_fmt/lib_libvserver_a-fmt-32.o: ensc_fmt/fmt-32.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ensc_fmt/lib_libvserver_a-fmt-32.o -MD -MP -MF "ensc_fmt/$(DEPDIR)/lib_libvserver_a-fmt-32.Tpo" -c -o ensc_fmt/lib_libvserver_a-fmt-32.o `test -f 'ensc_fmt/fmt-32.c' || echo '$(srcdir)/'`ensc_fmt/fmt-32.c; \
 @am__fastdepCC_TRUE@   then mv -f "ensc_fmt/$(DEPDIR)/lib_libvserver_a-fmt-32.Tpo" "ensc_fmt/$(DEPDIR)/lib_libvserver_a-fmt-32.Po"; else rm -f "ensc_fmt/$(DEPDIR)/lib_libvserver_a-fmt-32.Tpo"; exit 1; fi
@@ -7593,6 +8170,30 @@ lib_internal/lib_internal_libinternal_diet_a-util-isnumber.lo: lib_internal/util
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_diet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/lib_internal_libinternal_diet_a-util-isnumber.lo `test -f 'lib_internal/util-isnumber.c' || echo '$(srcdir)/'`lib_internal/util-isnumber.c
 
+lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.o: lib_internal/util-isnumberunsigned.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_diet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.o -MD -MP -MF "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Tpo" -c -o lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.o `test -f 'lib_internal/util-isnumberunsigned.c' || echo '$(srcdir)/'`lib_internal/util-isnumberunsigned.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Tpo" "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Po"; else rm -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib_internal/util-isnumberunsigned.c' object='lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Po' tmpdepfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_diet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.o `test -f 'lib_internal/util-isnumberunsigned.c' || echo '$(srcdir)/'`lib_internal/util-isnumberunsigned.c
+
+lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.obj: lib_internal/util-isnumberunsigned.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_diet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.obj -MD -MP -MF "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Tpo" -c -o lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.obj `if test -f 'lib_internal/util-isnumberunsigned.c'; then $(CYGPATH_W) 'lib_internal/util-isnumberunsigned.c'; else $(CYGPATH_W) '$(srcdir)/lib_internal/util-isnumberunsigned.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Tpo" "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Po"; else rm -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib_internal/util-isnumberunsigned.c' object='lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Po' tmpdepfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_diet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.obj `if test -f 'lib_internal/util-isnumberunsigned.c'; then $(CYGPATH_W) 'lib_internal/util-isnumberunsigned.c'; else $(CYGPATH_W) '$(srcdir)/lib_internal/util-isnumberunsigned.c'; fi`
+
+lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.lo: lib_internal/util-isnumberunsigned.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_diet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.lo -MD -MP -MF "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Tpo" -c -o lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.lo `test -f 'lib_internal/util-isnumberunsigned.c' || echo '$(srcdir)/'`lib_internal/util-isnumberunsigned.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Tpo" "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Plo"; else rm -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib_internal/util-isnumberunsigned.c' object='lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.Plo' tmpdepfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-isnumberunsigned.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_diet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/lib_internal_libinternal_diet_a-util-isnumberunsigned.lo `test -f 'lib_internal/util-isnumberunsigned.c' || echo '$(srcdir)/'`lib_internal/util-isnumberunsigned.c
+
 lib_internal/lib_internal_libinternal_diet_a-util-lockfile.o: lib_internal/util-lockfile.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_diet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/lib_internal_libinternal_diet_a-util-lockfile.o -MD -MP -MF "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-lockfile.Tpo" -c -o lib_internal/lib_internal_libinternal_diet_a-util-lockfile.o `test -f 'lib_internal/util-lockfile.c' || echo '$(srcdir)/'`lib_internal/util-lockfile.c; \
 @am__fastdepCC_TRUE@   then mv -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-lockfile.Tpo" "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-lockfile.Po"; else rm -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_diet_a-util-lockfile.Tpo"; exit 1; fi
@@ -8433,6 +9034,30 @@ lib_internal/lib_internal_libinternal_glibc_a-util-isnumber.lo: lib_internal/uti
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_glibc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/lib_internal_libinternal_glibc_a-util-isnumber.lo `test -f 'lib_internal/util-isnumber.c' || echo '$(srcdir)/'`lib_internal/util-isnumber.c
 
+lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.o: lib_internal/util-isnumberunsigned.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_glibc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.o -MD -MP -MF "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Tpo" -c -o lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.o `test -f 'lib_internal/util-isnumberunsigned.c' || echo '$(srcdir)/'`lib_internal/util-isnumberunsigned.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Tpo" "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Po"; else rm -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib_internal/util-isnumberunsigned.c' object='lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Po' tmpdepfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_glibc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.o `test -f 'lib_internal/util-isnumberunsigned.c' || echo '$(srcdir)/'`lib_internal/util-isnumberunsigned.c
+
+lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.obj: lib_internal/util-isnumberunsigned.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_glibc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.obj -MD -MP -MF "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Tpo" -c -o lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.obj `if test -f 'lib_internal/util-isnumberunsigned.c'; then $(CYGPATH_W) 'lib_internal/util-isnumberunsigned.c'; else $(CYGPATH_W) '$(srcdir)/lib_internal/util-isnumberunsigned.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Tpo" "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Po"; else rm -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib_internal/util-isnumberunsigned.c' object='lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Po' tmpdepfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_glibc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.obj `if test -f 'lib_internal/util-isnumberunsigned.c'; then $(CYGPATH_W) 'lib_internal/util-isnumberunsigned.c'; else $(CYGPATH_W) '$(srcdir)/lib_internal/util-isnumberunsigned.c'; fi`
+
+lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.lo: lib_internal/util-isnumberunsigned.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_glibc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.lo -MD -MP -MF "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Tpo" -c -o lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.lo `test -f 'lib_internal/util-isnumberunsigned.c' || echo '$(srcdir)/'`lib_internal/util-isnumberunsigned.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Tpo" "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Plo"; else rm -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib_internal/util-isnumberunsigned.c' object='lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.Plo' tmpdepfile='lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-isnumberunsigned.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_glibc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/lib_internal_libinternal_glibc_a-util-isnumberunsigned.lo `test -f 'lib_internal/util-isnumberunsigned.c' || echo '$(srcdir)/'`lib_internal/util-isnumberunsigned.c
+
 lib_internal/lib_internal_libinternal_glibc_a-util-lockfile.o: lib_internal/util-lockfile.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_internal_libinternal_glibc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/lib_internal_libinternal_glibc_a-util-lockfile.o -MD -MP -MF "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-lockfile.Tpo" -c -o lib_internal/lib_internal_libinternal_glibc_a-util-lockfile.o `test -f 'lib_internal/util-lockfile.c' || echo '$(srcdir)/'`lib_internal/util-lockfile.c; \
 @am__fastdepCC_TRUE@   then mv -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-lockfile.Tpo" "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-lockfile.Po"; else rm -f "lib_internal/$(DEPDIR)/lib_internal_libinternal_glibc_a-util-lockfile.Tpo"; exit 1; fi
@@ -9801,6 +10426,30 @@ lib/lib_libvserver_la-checkversion.lo: lib/checkversion.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-checkversion.lo `test -f 'lib/checkversion.c' || echo '$(srcdir)/'`lib/checkversion.c
 
+lib/lib_libvserver_la-checkconfig.o: lib/checkconfig.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-checkconfig.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Tpo" -c -o lib/lib_libvserver_la-checkconfig.o `test -f 'lib/checkconfig.c' || echo '$(srcdir)/'`lib/checkconfig.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/checkconfig.c' object='lib/lib_libvserver_la-checkconfig.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-checkconfig.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-checkconfig.o `test -f 'lib/checkconfig.c' || echo '$(srcdir)/'`lib/checkconfig.c
+
+lib/lib_libvserver_la-checkconfig.obj: lib/checkconfig.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-checkconfig.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Tpo" -c -o lib/lib_libvserver_la-checkconfig.obj `if test -f 'lib/checkconfig.c'; then $(CYGPATH_W) 'lib/checkconfig.c'; else $(CYGPATH_W) '$(srcdir)/lib/checkconfig.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/checkconfig.c' object='lib/lib_libvserver_la-checkconfig.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-checkconfig.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-checkconfig.obj `if test -f 'lib/checkconfig.c'; then $(CYGPATH_W) 'lib/checkconfig.c'; else $(CYGPATH_W) '$(srcdir)/lib/checkconfig.c'; fi`
+
+lib/lib_libvserver_la-checkconfig.lo: lib/checkconfig.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-checkconfig.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Tpo" -c -o lib/lib_libvserver_la-checkconfig.lo `test -f 'lib/checkconfig.c' || echo '$(srcdir)/'`lib/checkconfig.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/checkconfig.c' object='lib/lib_libvserver_la-checkconfig.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-checkconfig.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-checkconfig.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-checkconfig.lo `test -f 'lib/checkconfig.c' || echo '$(srcdir)/'`lib/checkconfig.c
+
 lib/lib_libvserver_la-isdirectory.o: lib/isdirectory.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-isdirectory.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-isdirectory.Tpo" -c -o lib/lib_libvserver_la-isdirectory.o `test -f 'lib/isdirectory.c' || echo '$(srcdir)/'`lib/isdirectory.c; \
 @am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-isdirectory.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-isdirectory.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-isdirectory.Tpo"; exit 1; fi
@@ -10449,6 +11098,30 @@ lib/lib_libvserver_la-cflags_list-compat.lo: lib/cflags_list-compat.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-cflags_list-compat.lo `test -f 'lib/cflags_list-compat.c' || echo '$(srcdir)/'`lib/cflags_list-compat.c
 
+lib/lib_libvserver_la-comparevserverbyid.o: lib/comparevserverbyid.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-comparevserverbyid.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Tpo" -c -o lib/lib_libvserver_la-comparevserverbyid.o `test -f 'lib/comparevserverbyid.c' || echo '$(srcdir)/'`lib/comparevserverbyid.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/comparevserverbyid.c' object='lib/lib_libvserver_la-comparevserverbyid.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-comparevserverbyid.o `test -f 'lib/comparevserverbyid.c' || echo '$(srcdir)/'`lib/comparevserverbyid.c
+
+lib/lib_libvserver_la-comparevserverbyid.obj: lib/comparevserverbyid.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-comparevserverbyid.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Tpo" -c -o lib/lib_libvserver_la-comparevserverbyid.obj `if test -f 'lib/comparevserverbyid.c'; then $(CYGPATH_W) 'lib/comparevserverbyid.c'; else $(CYGPATH_W) '$(srcdir)/lib/comparevserverbyid.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/comparevserverbyid.c' object='lib/lib_libvserver_la-comparevserverbyid.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-comparevserverbyid.obj `if test -f 'lib/comparevserverbyid.c'; then $(CYGPATH_W) 'lib/comparevserverbyid.c'; else $(CYGPATH_W) '$(srcdir)/lib/comparevserverbyid.c'; fi`
+
+lib/lib_libvserver_la-comparevserverbyid.lo: lib/comparevserverbyid.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-comparevserverbyid.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Tpo" -c -o lib/lib_libvserver_la-comparevserverbyid.lo `test -f 'lib/comparevserverbyid.c' || echo '$(srcdir)/'`lib/comparevserverbyid.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/comparevserverbyid.c' object='lib/lib_libvserver_la-comparevserverbyid.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-comparevserverbyid.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-comparevserverbyid.lo `test -f 'lib/comparevserverbyid.c' || echo '$(srcdir)/'`lib/comparevserverbyid.c
+
 lib/lib_libvserver_la-createskeleton.o: lib/createskeleton.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-createskeleton.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-createskeleton.Tpo" -c -o lib/lib_libvserver_la-createskeleton.o `test -f 'lib/createskeleton.c' || echo '$(srcdir)/'`lib/createskeleton.c; \
 @am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-createskeleton.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-createskeleton.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-createskeleton.Tpo"; exit 1; fi
@@ -10665,6 +11338,30 @@ lib/lib_libvserver_la-xidopt2xid.lo: lib/xidopt2xid.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-xidopt2xid.lo `test -f 'lib/xidopt2xid.c' || echo '$(srcdir)/'`lib/xidopt2xid.c
 
+lib/lib_libvserver_la-nidopt2nid.o: lib/nidopt2nid.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-nidopt2nid.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Tpo" -c -o lib/lib_libvserver_la-nidopt2nid.o `test -f 'lib/nidopt2nid.c' || echo '$(srcdir)/'`lib/nidopt2nid.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/nidopt2nid.c' object='lib/lib_libvserver_la-nidopt2nid.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-nidopt2nid.o `test -f 'lib/nidopt2nid.c' || echo '$(srcdir)/'`lib/nidopt2nid.c
+
+lib/lib_libvserver_la-nidopt2nid.obj: lib/nidopt2nid.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-nidopt2nid.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Tpo" -c -o lib/lib_libvserver_la-nidopt2nid.obj `if test -f 'lib/nidopt2nid.c'; then $(CYGPATH_W) 'lib/nidopt2nid.c'; else $(CYGPATH_W) '$(srcdir)/lib/nidopt2nid.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/nidopt2nid.c' object='lib/lib_libvserver_la-nidopt2nid.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-nidopt2nid.obj `if test -f 'lib/nidopt2nid.c'; then $(CYGPATH_W) 'lib/nidopt2nid.c'; else $(CYGPATH_W) '$(srcdir)/lib/nidopt2nid.c'; fi`
+
+lib/lib_libvserver_la-nidopt2nid.lo: lib/nidopt2nid.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-nidopt2nid.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Tpo" -c -o lib/lib_libvserver_la-nidopt2nid.lo `test -f 'lib/nidopt2nid.c' || echo '$(srcdir)/'`lib/nidopt2nid.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/nidopt2nid.c' object='lib/lib_libvserver_la-nidopt2nid.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-nidopt2nid.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-nidopt2nid.lo `test -f 'lib/nidopt2nid.c' || echo '$(srcdir)/'`lib/nidopt2nid.c
+
 lib/lib_libvserver_la-syscall_rlimit.o: lib/syscall_rlimit.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_rlimit.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimit.Tpo" -c -o lib/lib_libvserver_la-syscall_rlimit.o `test -f 'lib/syscall_rlimit.c' || echo '$(srcdir)/'`lib/syscall_rlimit.c; \
 @am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimit.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimit.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimit.Tpo"; exit 1; fi
@@ -11697,6 +12394,150 @@ lib/lib_libvserver_la-syscall_setdlimit.lo: lib/syscall_setdlimit.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_setdlimit.lo `test -f 'lib/syscall_setdlimit.c' || echo '$(srcdir)/'`lib/syscall_setdlimit.c
 
+lib/lib_libvserver_la-syscall_rlimitstat.o: lib/syscall_rlimitstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_rlimitstat.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Tpo" -c -o lib/lib_libvserver_la-syscall_rlimitstat.o `test -f 'lib/syscall_rlimitstat.c' || echo '$(srcdir)/'`lib/syscall_rlimitstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_rlimitstat.c' object='lib/lib_libvserver_la-syscall_rlimitstat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_rlimitstat.o `test -f 'lib/syscall_rlimitstat.c' || echo '$(srcdir)/'`lib/syscall_rlimitstat.c
+
+lib/lib_libvserver_la-syscall_rlimitstat.obj: lib/syscall_rlimitstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_rlimitstat.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Tpo" -c -o lib/lib_libvserver_la-syscall_rlimitstat.obj `if test -f 'lib/syscall_rlimitstat.c'; then $(CYGPATH_W) 'lib/syscall_rlimitstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_rlimitstat.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_rlimitstat.c' object='lib/lib_libvserver_la-syscall_rlimitstat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_rlimitstat.obj `if test -f 'lib/syscall_rlimitstat.c'; then $(CYGPATH_W) 'lib/syscall_rlimitstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_rlimitstat.c'; fi`
+
+lib/lib_libvserver_la-syscall_rlimitstat.lo: lib/syscall_rlimitstat.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_rlimitstat.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Tpo" -c -o lib/lib_libvserver_la-syscall_rlimitstat.lo `test -f 'lib/syscall_rlimitstat.c' || echo '$(srcdir)/'`lib/syscall_rlimitstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_rlimitstat.c' object='lib/lib_libvserver_la-syscall_rlimitstat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_rlimitstat.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_rlimitstat.lo `test -f 'lib/syscall_rlimitstat.c' || echo '$(srcdir)/'`lib/syscall_rlimitstat.c
+
+lib/lib_libvserver_la-syscall_resetminmax.o: lib/syscall_resetminmax.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_resetminmax.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Tpo" -c -o lib/lib_libvserver_la-syscall_resetminmax.o `test -f 'lib/syscall_resetminmax.c' || echo '$(srcdir)/'`lib/syscall_resetminmax.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_resetminmax.c' object='lib/lib_libvserver_la-syscall_resetminmax.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_resetminmax.o `test -f 'lib/syscall_resetminmax.c' || echo '$(srcdir)/'`lib/syscall_resetminmax.c
+
+lib/lib_libvserver_la-syscall_resetminmax.obj: lib/syscall_resetminmax.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_resetminmax.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Tpo" -c -o lib/lib_libvserver_la-syscall_resetminmax.obj `if test -f 'lib/syscall_resetminmax.c'; then $(CYGPATH_W) 'lib/syscall_resetminmax.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_resetminmax.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_resetminmax.c' object='lib/lib_libvserver_la-syscall_resetminmax.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_resetminmax.obj `if test -f 'lib/syscall_resetminmax.c'; then $(CYGPATH_W) 'lib/syscall_resetminmax.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_resetminmax.c'; fi`
+
+lib/lib_libvserver_la-syscall_resetminmax.lo: lib/syscall_resetminmax.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_resetminmax.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Tpo" -c -o lib/lib_libvserver_la-syscall_resetminmax.lo `test -f 'lib/syscall_resetminmax.c' || echo '$(srcdir)/'`lib/syscall_resetminmax.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_resetminmax.c' object='lib/lib_libvserver_la-syscall_resetminmax.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_resetminmax.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_resetminmax.lo `test -f 'lib/syscall_resetminmax.c' || echo '$(srcdir)/'`lib/syscall_resetminmax.c
+
+lib/lib_libvserver_la-syscall_getvci.o: lib/syscall_getvci.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_getvci.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Tpo" -c -o lib/lib_libvserver_la-syscall_getvci.o `test -f 'lib/syscall_getvci.c' || echo '$(srcdir)/'`lib/syscall_getvci.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getvci.c' object='lib/lib_libvserver_la-syscall_getvci.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_getvci.o `test -f 'lib/syscall_getvci.c' || echo '$(srcdir)/'`lib/syscall_getvci.c
+
+lib/lib_libvserver_la-syscall_getvci.obj: lib/syscall_getvci.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_getvci.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Tpo" -c -o lib/lib_libvserver_la-syscall_getvci.obj `if test -f 'lib/syscall_getvci.c'; then $(CYGPATH_W) 'lib/syscall_getvci.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_getvci.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getvci.c' object='lib/lib_libvserver_la-syscall_getvci.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_getvci.obj `if test -f 'lib/syscall_getvci.c'; then $(CYGPATH_W) 'lib/syscall_getvci.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_getvci.c'; fi`
+
+lib/lib_libvserver_la-syscall_getvci.lo: lib/syscall_getvci.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_getvci.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Tpo" -c -o lib/lib_libvserver_la-syscall_getvci.lo `test -f 'lib/syscall_getvci.c' || echo '$(srcdir)/'`lib/syscall_getvci.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getvci.c' object='lib/lib_libvserver_la-syscall_getvci.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getvci.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_getvci.lo `test -f 'lib/syscall_getvci.c' || echo '$(srcdir)/'`lib/syscall_getvci.c
+
+lib/lib_libvserver_la-syscall_virtstat.o: lib/syscall_virtstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_virtstat.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Tpo" -c -o lib/lib_libvserver_la-syscall_virtstat.o `test -f 'lib/syscall_virtstat.c' || echo '$(srcdir)/'`lib/syscall_virtstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_virtstat.c' object='lib/lib_libvserver_la-syscall_virtstat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_virtstat.o `test -f 'lib/syscall_virtstat.c' || echo '$(srcdir)/'`lib/syscall_virtstat.c
+
+lib/lib_libvserver_la-syscall_virtstat.obj: lib/syscall_virtstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_virtstat.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Tpo" -c -o lib/lib_libvserver_la-syscall_virtstat.obj `if test -f 'lib/syscall_virtstat.c'; then $(CYGPATH_W) 'lib/syscall_virtstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_virtstat.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_virtstat.c' object='lib/lib_libvserver_la-syscall_virtstat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_virtstat.obj `if test -f 'lib/syscall_virtstat.c'; then $(CYGPATH_W) 'lib/syscall_virtstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_virtstat.c'; fi`
+
+lib/lib_libvserver_la-syscall_virtstat.lo: lib/syscall_virtstat.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_virtstat.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Tpo" -c -o lib/lib_libvserver_la-syscall_virtstat.lo `test -f 'lib/syscall_virtstat.c' || echo '$(srcdir)/'`lib/syscall_virtstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_virtstat.c' object='lib/lib_libvserver_la-syscall_virtstat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_virtstat.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_virtstat.lo `test -f 'lib/syscall_virtstat.c' || echo '$(srcdir)/'`lib/syscall_virtstat.c
+
+lib/lib_libvserver_la-syscall_ctxstat.o: lib/syscall_ctxstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_ctxstat.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Tpo" -c -o lib/lib_libvserver_la-syscall_ctxstat.o `test -f 'lib/syscall_ctxstat.c' || echo '$(srcdir)/'`lib/syscall_ctxstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_ctxstat.c' object='lib/lib_libvserver_la-syscall_ctxstat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_ctxstat.o `test -f 'lib/syscall_ctxstat.c' || echo '$(srcdir)/'`lib/syscall_ctxstat.c
+
+lib/lib_libvserver_la-syscall_ctxstat.obj: lib/syscall_ctxstat.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_ctxstat.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Tpo" -c -o lib/lib_libvserver_la-syscall_ctxstat.obj `if test -f 'lib/syscall_ctxstat.c'; then $(CYGPATH_W) 'lib/syscall_ctxstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_ctxstat.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_ctxstat.c' object='lib/lib_libvserver_la-syscall_ctxstat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_ctxstat.obj `if test -f 'lib/syscall_ctxstat.c'; then $(CYGPATH_W) 'lib/syscall_ctxstat.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_ctxstat.c'; fi`
+
+lib/lib_libvserver_la-syscall_ctxstat.lo: lib/syscall_ctxstat.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_ctxstat.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Tpo" -c -o lib/lib_libvserver_la-syscall_ctxstat.lo `test -f 'lib/syscall_ctxstat.c' || echo '$(srcdir)/'`lib/syscall_ctxstat.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_ctxstat.c' object='lib/lib_libvserver_la-syscall_ctxstat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_ctxstat.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_ctxstat.lo `test -f 'lib/syscall_ctxstat.c' || echo '$(srcdir)/'`lib/syscall_ctxstat.c
+
+lib/lib_libvserver_la-syscall_getspacemask.o: lib/syscall_getspacemask.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_getspacemask.o -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Tpo" -c -o lib/lib_libvserver_la-syscall_getspacemask.o `test -f 'lib/syscall_getspacemask.c' || echo '$(srcdir)/'`lib/syscall_getspacemask.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getspacemask.c' object='lib/lib_libvserver_la-syscall_getspacemask.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_getspacemask.o `test -f 'lib/syscall_getspacemask.c' || echo '$(srcdir)/'`lib/syscall_getspacemask.c
+
+lib/lib_libvserver_la-syscall_getspacemask.obj: lib/syscall_getspacemask.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_getspacemask.obj -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Tpo" -c -o lib/lib_libvserver_la-syscall_getspacemask.obj `if test -f 'lib/syscall_getspacemask.c'; then $(CYGPATH_W) 'lib/syscall_getspacemask.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_getspacemask.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Po"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getspacemask.c' object='lib/lib_libvserver_la-syscall_getspacemask.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Po' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_getspacemask.obj `if test -f 'lib/syscall_getspacemask.c'; then $(CYGPATH_W) 'lib/syscall_getspacemask.c'; else $(CYGPATH_W) '$(srcdir)/lib/syscall_getspacemask.c'; fi`
+
+lib/lib_libvserver_la-syscall_getspacemask.lo: lib/syscall_getspacemask.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/lib_libvserver_la-syscall_getspacemask.lo -MD -MP -MF "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Tpo" -c -o lib/lib_libvserver_la-syscall_getspacemask.lo `test -f 'lib/syscall_getspacemask.c' || echo '$(srcdir)/'`lib/syscall_getspacemask.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Tpo" "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Plo"; else rm -f "lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib/syscall_getspacemask.c' object='lib/lib_libvserver_la-syscall_getspacemask.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.Plo' tmpdepfile='lib/$(DEPDIR)/lib_libvserver_la-syscall_getspacemask.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/lib_libvserver_la-syscall_getspacemask.lo `test -f 'lib/syscall_getspacemask.c' || echo '$(srcdir)/'`lib/syscall_getspacemask.c
+
 ensc_fmt/lib_libvserver_la-fmt-32.o: ensc_fmt/fmt-32.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_libvserver_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ensc_fmt/lib_libvserver_la-fmt-32.o -MD -MP -MF "ensc_fmt/$(DEPDIR)/lib_libvserver_la-fmt-32.Tpo" -c -o ensc_fmt/lib_libvserver_la-fmt-32.o `test -f 'ensc_fmt/fmt-32.c' || echo '$(srcdir)/'`ensc_fmt/fmt-32.c; \
 @am__fastdepCC_TRUE@   then mv -f "ensc_fmt/$(DEPDIR)/lib_libvserver_la-fmt-32.Tpo" "ensc_fmt/$(DEPDIR)/lib_libvserver_la-fmt-32.Po"; else rm -f "ensc_fmt/$(DEPDIR)/lib_libvserver_la-fmt-32.Tpo"; exit 1; fi
@@ -12057,6 +12898,30 @@ lib_internal/testsuite/filecfg-ml.lo: lib_internal/testsuite/filecfg-ml.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/testsuite/filecfg-ml.lo `test -f 'lib_internal/testsuite/filecfg-ml.c' || echo '$(srcdir)/'`lib_internal/testsuite/filecfg-ml.c
 
+lib_internal/testsuite/isnumber.o: lib_internal/testsuite/isnumber.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/testsuite/isnumber.o -MD -MP -MF "lib_internal/testsuite/$(DEPDIR)/isnumber.Tpo" -c -o lib_internal/testsuite/isnumber.o `test -f 'lib_internal/testsuite/isnumber.c' || echo '$(srcdir)/'`lib_internal/testsuite/isnumber.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib_internal/testsuite/$(DEPDIR)/isnumber.Tpo" "lib_internal/testsuite/$(DEPDIR)/isnumber.Po"; else rm -f "lib_internal/testsuite/$(DEPDIR)/isnumber.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib_internal/testsuite/isnumber.c' object='lib_internal/testsuite/isnumber.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib_internal/testsuite/$(DEPDIR)/isnumber.Po' tmpdepfile='lib_internal/testsuite/$(DEPDIR)/isnumber.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/testsuite/isnumber.o `test -f 'lib_internal/testsuite/isnumber.c' || echo '$(srcdir)/'`lib_internal/testsuite/isnumber.c
+
+lib_internal/testsuite/isnumber.obj: lib_internal/testsuite/isnumber.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/testsuite/isnumber.obj -MD -MP -MF "lib_internal/testsuite/$(DEPDIR)/isnumber.Tpo" -c -o lib_internal/testsuite/isnumber.obj `if test -f 'lib_internal/testsuite/isnumber.c'; then $(CYGPATH_W) 'lib_internal/testsuite/isnumber.c'; else $(CYGPATH_W) '$(srcdir)/lib_internal/testsuite/isnumber.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "lib_internal/testsuite/$(DEPDIR)/isnumber.Tpo" "lib_internal/testsuite/$(DEPDIR)/isnumber.Po"; else rm -f "lib_internal/testsuite/$(DEPDIR)/isnumber.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib_internal/testsuite/isnumber.c' object='lib_internal/testsuite/isnumber.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib_internal/testsuite/$(DEPDIR)/isnumber.Po' tmpdepfile='lib_internal/testsuite/$(DEPDIR)/isnumber.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/testsuite/isnumber.obj `if test -f 'lib_internal/testsuite/isnumber.c'; then $(CYGPATH_W) 'lib_internal/testsuite/isnumber.c'; else $(CYGPATH_W) '$(srcdir)/lib_internal/testsuite/isnumber.c'; fi`
+
+lib_internal/testsuite/isnumber.lo: lib_internal/testsuite/isnumber.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/testsuite/isnumber.lo -MD -MP -MF "lib_internal/testsuite/$(DEPDIR)/isnumber.Tpo" -c -o lib_internal/testsuite/isnumber.lo `test -f 'lib_internal/testsuite/isnumber.c' || echo '$(srcdir)/'`lib_internal/testsuite/isnumber.c; \
+@am__fastdepCC_TRUE@   then mv -f "lib_internal/testsuite/$(DEPDIR)/isnumber.Tpo" "lib_internal/testsuite/$(DEPDIR)/isnumber.Plo"; else rm -f "lib_internal/testsuite/$(DEPDIR)/isnumber.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lib_internal/testsuite/isnumber.c' object='lib_internal/testsuite/isnumber.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='lib_internal/testsuite/$(DEPDIR)/isnumber.Plo' tmpdepfile='lib_internal/testsuite/$(DEPDIR)/isnumber.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_internal/testsuite/isnumber.lo `test -f 'lib_internal/testsuite/isnumber.c' || echo '$(srcdir)/'`lib_internal/testsuite/isnumber.c
+
 lib_internal/testsuite/sigbus.o: lib_internal/testsuite/sigbus.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_internal/testsuite/sigbus.o -MD -MP -MF "lib_internal/testsuite/$(DEPDIR)/sigbus.Tpo" -c -o lib_internal/testsuite/sigbus.o `test -f 'lib_internal/testsuite/sigbus.c' || echo '$(srcdir)/'`lib_internal/testsuite/sigbus.c; \
 @am__fastdepCC_TRUE@   then mv -f "lib_internal/testsuite/$(DEPDIR)/sigbus.Tpo" "lib_internal/testsuite/$(DEPDIR)/sigbus.Po"; else rm -f "lib_internal/testsuite/$(DEPDIR)/sigbus.Tpo"; exit 1; fi
@@ -12513,6 +13378,78 @@ src/mask2prefix.lo: src/mask2prefix.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/mask2prefix.lo `test -f 'src/mask2prefix.c' || echo '$(srcdir)/'`src/mask2prefix.c
 
+src/naddress.o: src/naddress.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/naddress.o -MD -MP -MF "src/$(DEPDIR)/naddress.Tpo" -c -o src/naddress.o `test -f 'src/naddress.c' || echo '$(srcdir)/'`src/naddress.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/naddress.Tpo" "src/$(DEPDIR)/naddress.Po"; else rm -f "src/$(DEPDIR)/naddress.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/naddress.c' object='src/naddress.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/naddress.Po' tmpdepfile='src/$(DEPDIR)/naddress.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/naddress.o `test -f 'src/naddress.c' || echo '$(srcdir)/'`src/naddress.c
+
+src/naddress.obj: src/naddress.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/naddress.obj -MD -MP -MF "src/$(DEPDIR)/naddress.Tpo" -c -o src/naddress.obj `if test -f 'src/naddress.c'; then $(CYGPATH_W) 'src/naddress.c'; else $(CYGPATH_W) '$(srcdir)/src/naddress.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/naddress.Tpo" "src/$(DEPDIR)/naddress.Po"; else rm -f "src/$(DEPDIR)/naddress.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/naddress.c' object='src/naddress.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/naddress.Po' tmpdepfile='src/$(DEPDIR)/naddress.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/naddress.obj `if test -f 'src/naddress.c'; then $(CYGPATH_W) 'src/naddress.c'; else $(CYGPATH_W) '$(srcdir)/src/naddress.c'; fi`
+
+src/naddress.lo: src/naddress.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/naddress.lo -MD -MP -MF "src/$(DEPDIR)/naddress.Tpo" -c -o src/naddress.lo `test -f 'src/naddress.c' || echo '$(srcdir)/'`src/naddress.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/naddress.Tpo" "src/$(DEPDIR)/naddress.Plo"; else rm -f "src/$(DEPDIR)/naddress.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/naddress.c' object='src/naddress.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/naddress.Plo' tmpdepfile='src/$(DEPDIR)/naddress.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/naddress.lo `test -f 'src/naddress.c' || echo '$(srcdir)/'`src/naddress.c
+
+src/nattribute.o: src/nattribute.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/nattribute.o -MD -MP -MF "src/$(DEPDIR)/nattribute.Tpo" -c -o src/nattribute.o `test -f 'src/nattribute.c' || echo '$(srcdir)/'`src/nattribute.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/nattribute.Tpo" "src/$(DEPDIR)/nattribute.Po"; else rm -f "src/$(DEPDIR)/nattribute.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/nattribute.c' object='src/nattribute.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/nattribute.Po' tmpdepfile='src/$(DEPDIR)/nattribute.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nattribute.o `test -f 'src/nattribute.c' || echo '$(srcdir)/'`src/nattribute.c
+
+src/nattribute.obj: src/nattribute.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/nattribute.obj -MD -MP -MF "src/$(DEPDIR)/nattribute.Tpo" -c -o src/nattribute.obj `if test -f 'src/nattribute.c'; then $(CYGPATH_W) 'src/nattribute.c'; else $(CYGPATH_W) '$(srcdir)/src/nattribute.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/nattribute.Tpo" "src/$(DEPDIR)/nattribute.Po"; else rm -f "src/$(DEPDIR)/nattribute.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/nattribute.c' object='src/nattribute.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/nattribute.Po' tmpdepfile='src/$(DEPDIR)/nattribute.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nattribute.obj `if test -f 'src/nattribute.c'; then $(CYGPATH_W) 'src/nattribute.c'; else $(CYGPATH_W) '$(srcdir)/src/nattribute.c'; fi`
+
+src/nattribute.lo: src/nattribute.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/nattribute.lo -MD -MP -MF "src/$(DEPDIR)/nattribute.Tpo" -c -o src/nattribute.lo `test -f 'src/nattribute.c' || echo '$(srcdir)/'`src/nattribute.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/nattribute.Tpo" "src/$(DEPDIR)/nattribute.Plo"; else rm -f "src/$(DEPDIR)/nattribute.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/nattribute.c' object='src/nattribute.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/nattribute.Plo' tmpdepfile='src/$(DEPDIR)/nattribute.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nattribute.lo `test -f 'src/nattribute.c' || echo '$(srcdir)/'`src/nattribute.c
+
+src/ncontext.o: src/ncontext.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ncontext.o -MD -MP -MF "src/$(DEPDIR)/ncontext.Tpo" -c -o src/ncontext.o `test -f 'src/ncontext.c' || echo '$(srcdir)/'`src/ncontext.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/ncontext.Tpo" "src/$(DEPDIR)/ncontext.Po"; else rm -f "src/$(DEPDIR)/ncontext.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/ncontext.c' object='src/ncontext.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/ncontext.Po' tmpdepfile='src/$(DEPDIR)/ncontext.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ncontext.o `test -f 'src/ncontext.c' || echo '$(srcdir)/'`src/ncontext.c
+
+src/ncontext.obj: src/ncontext.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ncontext.obj -MD -MP -MF "src/$(DEPDIR)/ncontext.Tpo" -c -o src/ncontext.obj `if test -f 'src/ncontext.c'; then $(CYGPATH_W) 'src/ncontext.c'; else $(CYGPATH_W) '$(srcdir)/src/ncontext.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/ncontext.Tpo" "src/$(DEPDIR)/ncontext.Po"; else rm -f "src/$(DEPDIR)/ncontext.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/ncontext.c' object='src/ncontext.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/ncontext.Po' tmpdepfile='src/$(DEPDIR)/ncontext.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ncontext.obj `if test -f 'src/ncontext.c'; then $(CYGPATH_W) 'src/ncontext.c'; else $(CYGPATH_W) '$(srcdir)/src/ncontext.c'; fi`
+
+src/ncontext.lo: src/ncontext.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ncontext.lo -MD -MP -MF "src/$(DEPDIR)/ncontext.Tpo" -c -o src/ncontext.lo `test -f 'src/ncontext.c' || echo '$(srcdir)/'`src/ncontext.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/ncontext.Tpo" "src/$(DEPDIR)/ncontext.Plo"; else rm -f "src/$(DEPDIR)/ncontext.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/ncontext.c' object='src/ncontext.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/ncontext.Plo' tmpdepfile='src/$(DEPDIR)/ncontext.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ncontext.lo `test -f 'src/ncontext.c' || echo '$(srcdir)/'`src/ncontext.c
+
 src/parserpmdump.o: src/parserpmdump.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/parserpmdump.o -MD -MP -MF "src/$(DEPDIR)/parserpmdump.Tpo" -c -o src/parserpmdump.o `test -f 'src/parserpmdump.c' || echo '$(srcdir)/'`src/parserpmdump.c; \
 @am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/parserpmdump.Tpo" "src/$(DEPDIR)/parserpmdump.Po"; else rm -f "src/$(DEPDIR)/parserpmdump.Tpo"; exit 1; fi
@@ -12825,6 +13762,54 @@ src/testsuite/chcontext-test.lo: src/testsuite/chcontext-test.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/testsuite/chcontext-test.lo `test -f 'src/testsuite/chcontext-test.c' || echo '$(srcdir)/'`src/testsuite/chcontext-test.c
 
+src/testsuite/hashcalc.o: src/testsuite/hashcalc.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/testsuite/hashcalc.o -MD -MP -MF "src/testsuite/$(DEPDIR)/hashcalc.Tpo" -c -o src/testsuite/hashcalc.o `test -f 'src/testsuite/hashcalc.c' || echo '$(srcdir)/'`src/testsuite/hashcalc.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/testsuite/$(DEPDIR)/hashcalc.Tpo" "src/testsuite/$(DEPDIR)/hashcalc.Po"; else rm -f "src/testsuite/$(DEPDIR)/hashcalc.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/testsuite/hashcalc.c' object='src/testsuite/hashcalc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/testsuite/$(DEPDIR)/hashcalc.Po' tmpdepfile='src/testsuite/$(DEPDIR)/hashcalc.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/testsuite/hashcalc.o `test -f 'src/testsuite/hashcalc.c' || echo '$(srcdir)/'`src/testsuite/hashcalc.c
+
+src/testsuite/hashcalc.obj: src/testsuite/hashcalc.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/testsuite/hashcalc.obj -MD -MP -MF "src/testsuite/$(DEPDIR)/hashcalc.Tpo" -c -o src/testsuite/hashcalc.obj `if test -f 'src/testsuite/hashcalc.c'; then $(CYGPATH_W) 'src/testsuite/hashcalc.c'; else $(CYGPATH_W) '$(srcdir)/src/testsuite/hashcalc.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "src/testsuite/$(DEPDIR)/hashcalc.Tpo" "src/testsuite/$(DEPDIR)/hashcalc.Po"; else rm -f "src/testsuite/$(DEPDIR)/hashcalc.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/testsuite/hashcalc.c' object='src/testsuite/hashcalc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/testsuite/$(DEPDIR)/hashcalc.Po' tmpdepfile='src/testsuite/$(DEPDIR)/hashcalc.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/testsuite/hashcalc.obj `if test -f 'src/testsuite/hashcalc.c'; then $(CYGPATH_W) 'src/testsuite/hashcalc.c'; else $(CYGPATH_W) '$(srcdir)/src/testsuite/hashcalc.c'; fi`
+
+src/testsuite/hashcalc.lo: src/testsuite/hashcalc.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/testsuite/hashcalc.lo -MD -MP -MF "src/testsuite/$(DEPDIR)/hashcalc.Tpo" -c -o src/testsuite/hashcalc.lo `test -f 'src/testsuite/hashcalc.c' || echo '$(srcdir)/'`src/testsuite/hashcalc.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/testsuite/$(DEPDIR)/hashcalc.Tpo" "src/testsuite/$(DEPDIR)/hashcalc.Plo"; else rm -f "src/testsuite/$(DEPDIR)/hashcalc.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/testsuite/hashcalc.c' object='src/testsuite/hashcalc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/testsuite/$(DEPDIR)/hashcalc.Plo' tmpdepfile='src/testsuite/$(DEPDIR)/hashcalc.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/testsuite/hashcalc.lo `test -f 'src/testsuite/hashcalc.c' || echo '$(srcdir)/'`src/testsuite/hashcalc.c
+
+src/testsuite/hashcalc-plain.o: src/testsuite/hashcalc-plain.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/testsuite/hashcalc-plain.o -MD -MP -MF "src/testsuite/$(DEPDIR)/hashcalc-plain.Tpo" -c -o src/testsuite/hashcalc-plain.o `test -f 'src/testsuite/hashcalc-plain.c' || echo '$(srcdir)/'`src/testsuite/hashcalc-plain.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/testsuite/$(DEPDIR)/hashcalc-plain.Tpo" "src/testsuite/$(DEPDIR)/hashcalc-plain.Po"; else rm -f "src/testsuite/$(DEPDIR)/hashcalc-plain.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/testsuite/hashcalc-plain.c' object='src/testsuite/hashcalc-plain.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/testsuite/$(DEPDIR)/hashcalc-plain.Po' tmpdepfile='src/testsuite/$(DEPDIR)/hashcalc-plain.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/testsuite/hashcalc-plain.o `test -f 'src/testsuite/hashcalc-plain.c' || echo '$(srcdir)/'`src/testsuite/hashcalc-plain.c
+
+src/testsuite/hashcalc-plain.obj: src/testsuite/hashcalc-plain.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/testsuite/hashcalc-plain.obj -MD -MP -MF "src/testsuite/$(DEPDIR)/hashcalc-plain.Tpo" -c -o src/testsuite/hashcalc-plain.obj `if test -f 'src/testsuite/hashcalc-plain.c'; then $(CYGPATH_W) 'src/testsuite/hashcalc-plain.c'; else $(CYGPATH_W) '$(srcdir)/src/testsuite/hashcalc-plain.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "src/testsuite/$(DEPDIR)/hashcalc-plain.Tpo" "src/testsuite/$(DEPDIR)/hashcalc-plain.Po"; else rm -f "src/testsuite/$(DEPDIR)/hashcalc-plain.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/testsuite/hashcalc-plain.c' object='src/testsuite/hashcalc-plain.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/testsuite/$(DEPDIR)/hashcalc-plain.Po' tmpdepfile='src/testsuite/$(DEPDIR)/hashcalc-plain.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/testsuite/hashcalc-plain.obj `if test -f 'src/testsuite/hashcalc-plain.c'; then $(CYGPATH_W) 'src/testsuite/hashcalc-plain.c'; else $(CYGPATH_W) '$(srcdir)/src/testsuite/hashcalc-plain.c'; fi`
+
+src/testsuite/hashcalc-plain.lo: src/testsuite/hashcalc-plain.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/testsuite/hashcalc-plain.lo -MD -MP -MF "src/testsuite/$(DEPDIR)/hashcalc-plain.Tpo" -c -o src/testsuite/hashcalc-plain.lo `test -f 'src/testsuite/hashcalc-plain.c' || echo '$(srcdir)/'`src/testsuite/hashcalc-plain.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/testsuite/$(DEPDIR)/hashcalc-plain.Tpo" "src/testsuite/$(DEPDIR)/hashcalc-plain.Plo"; else rm -f "src/testsuite/$(DEPDIR)/hashcalc-plain.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/testsuite/hashcalc-plain.c' object='src/testsuite/hashcalc-plain.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/testsuite/$(DEPDIR)/hashcalc-plain.Plo' tmpdepfile='src/testsuite/$(DEPDIR)/hashcalc-plain.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/testsuite/hashcalc-plain.lo `test -f 'src/testsuite/hashcalc-plain.c' || echo '$(srcdir)/'`src/testsuite/hashcalc-plain.c
+
 src/testsuite/rpm-fake-test.o: src/testsuite/rpm-fake-test.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/testsuite/rpm-fake-test.o -MD -MP -MF "src/testsuite/$(DEPDIR)/rpm-fake-test.Tpo" -c -o src/testsuite/rpm-fake-test.o `test -f 'src/testsuite/rpm-fake-test.c' || echo '$(srcdir)/'`src/testsuite/rpm-fake-test.c; \
 @am__fastdepCC_TRUE@   then mv -f "src/testsuite/$(DEPDIR)/rpm-fake-test.Tpo" "src/testsuite/$(DEPDIR)/rpm-fake-test.Po"; else rm -f "src/testsuite/$(DEPDIR)/rpm-fake-test.Tpo"; exit 1; fi
@@ -12921,6 +13906,30 @@ src/vcontext.lo: src/vcontext.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/vcontext.lo `test -f 'src/vcontext.c' || echo '$(srcdir)/'`src/vcontext.c
 
+src/vlogin.o: src/vlogin.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/vlogin.o -MD -MP -MF "src/$(DEPDIR)/vlogin.Tpo" -c -o src/vlogin.o `test -f 'src/vlogin.c' || echo '$(srcdir)/'`src/vlogin.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/vlogin.Tpo" "src/$(DEPDIR)/vlogin.Po"; else rm -f "src/$(DEPDIR)/vlogin.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/vlogin.c' object='src/vlogin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/vlogin.Po' tmpdepfile='src/$(DEPDIR)/vlogin.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/vlogin.o `test -f 'src/vlogin.c' || echo '$(srcdir)/'`src/vlogin.c
+
+src/vlogin.obj: src/vlogin.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/vlogin.obj -MD -MP -MF "src/$(DEPDIR)/vlogin.Tpo" -c -o src/vlogin.obj `if test -f 'src/vlogin.c'; then $(CYGPATH_W) 'src/vlogin.c'; else $(CYGPATH_W) '$(srcdir)/src/vlogin.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/vlogin.Tpo" "src/$(DEPDIR)/vlogin.Po"; else rm -f "src/$(DEPDIR)/vlogin.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/vlogin.c' object='src/vlogin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/vlogin.Po' tmpdepfile='src/$(DEPDIR)/vlogin.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/vlogin.obj `if test -f 'src/vlogin.c'; then $(CYGPATH_W) 'src/vlogin.c'; else $(CYGPATH_W) '$(srcdir)/src/vlogin.c'; fi`
+
+src/vlogin.lo: src/vlogin.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/vlogin.lo -MD -MP -MF "src/$(DEPDIR)/vlogin.Tpo" -c -o src/vlogin.lo `test -f 'src/vlogin.c' || echo '$(srcdir)/'`src/vlogin.c; \
+@am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/vlogin.Tpo" "src/$(DEPDIR)/vlogin.Plo"; else rm -f "src/$(DEPDIR)/vlogin.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/vlogin.c' object='src/vlogin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='src/$(DEPDIR)/vlogin.Plo' tmpdepfile='src/$(DEPDIR)/vlogin.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/vlogin.lo `test -f 'src/vlogin.c' || echo '$(srcdir)/'`src/vlogin.c
+
 src/vcopy.o: src/vcopy.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/vcopy.o -MD -MP -MF "src/$(DEPDIR)/vcopy.Tpo" -c -o src/vcopy.o `test -f 'src/vcopy.c' || echo '$(srcdir)/'`src/vcopy.c; \
 @am__fastdepCC_TRUE@   then mv -f "src/$(DEPDIR)/vcopy.Tpo" "src/$(DEPDIR)/vcopy.Po"; else rm -f "src/$(DEPDIR)/vcopy.Tpo"; exit 1; fi
@@ -14596,19 +15605,16 @@ uninstall-man: uninstall-man8
 
 
 silent.%:              FORCE
-                       @t=$$(mktemp /tmp/build.XXXXXX) && \
-                       $(MAKE) '$*' -s 2>$$t >/dev/null && \
-                       ( cat $$t | \
-                               grep -v ': In function' | \
-                               grep -v 'your code still has assertions enabled' | \
-                               grep -v ' is obsoleted' | \
-                               grep -v 'warning: #warning'; \
-                               rm -f $$t || : )
-
-linuxvirtual.h:
-@ENSC_ENABLE_INTERNAL_HEADERS_TRUE@                    ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
-@ENSC_ENABLE_INTERNAL_HEADERS_FALSE@                   ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \
-@ENSC_ENABLE_INTERNAL_HEADERS_FALSE@                   ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
+                       @t=$$($(MKTEMP) -d /tmp/build.XXXXXX) && \
+                       trap "rm -rf $$t" EXIT && \
+                       mkfifo $$t/fifo && \
+                       ( grep --line-buffered -v \
+                                    -e ': In function' \
+                                    -e 'your code still has assertions enabled' \
+                                    -e ' is obsoleted' \
+                                    -e 'warning: #warning' <$$t/fifo & ) && \
+                       exec 2>$$t/fifo && \
+                       $(MAKE) '$*' -s >/dev/null
 
 pathconfig.h:          .pathconfig.h.pathsubst.stamp
 .%.pathsubst.stamp:    %.pathsubst Makefile
@@ -14631,10 +15637,12 @@ update-doc:           doc
 install-data-hook:     install-fix-script-paths install-create-dirs
 
 install-create-dirs:
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstatedir).rev $(DESTDIR)$(vshelperstatedir)
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir)
-                       f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)'      "$$f"
-                       f=$(DESTDIR)$(pkgstaterevdir);           test -e "$$f" || ln -sf '$(pkgstatedir).rev' "$$f"
+                       $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstatedir).rev $(DESTDIR)$(vshelperstatedir)
+                       $(mkinstalldirs) -m 0700 $(DESTDIR)$(pkgcachedir)
+                       $(mkinstalldirs) -m 0755 $(DESTDIR)$(confdefaultsdir)
+                       f=$(DESTDIR)$(confdefaultsdir)/vdirbase;  test -e "$$f" || ln -sf '$(vserverdir)'      "$$f"
+                       f=$(DESTDIR)$(confdefaultsdir)/cachebase; test -e "$$f" || ln -sf '$(pkgcachedir)'     "$$f"
+                       f=$(DESTDIR)$(pkgstaterevdir);            test -e "$$f" || ln -sf '$(pkgstatedir).rev' "$$f"
 
 install-fix-script-paths:
                        test "/usr/lib/util-vserver" = "$(pkglibdir)" || \
@@ -14663,10 +15671,10 @@ _install-vserverdir:
 @USE_DIETLIBC_TRUE@            :               CC=$(DIET_CC)
 
 install-exec-hook:
-       cd $(DESTDIR)$(sbindir) && $(LN_S) vuseradd vadduser
-       cd $(DESTDIR)$(sbindir) && $(LN_S) vuserdel vdeluser
+       cd $(DESTDIR)$(sbindir) && $(LN_S)f vuseradd vadduser
+       cd $(DESTDIR)$(sbindir) && $(LN_S)f vuserdel vdeluser
        mkdir -p $(DESTDIR)/bin
-       cd $(DESTDIR)/bin && $(LN_S) ../$(sbindir)/vsh
+       cd $(DESTDIR)/bin && $(LN_S)f ../$(sbindir)/vsh
 
 install-data-hook:
        install -D -m 644 scripts/vcached.logrotate $(DESTDIR)/$(sysconfdir)/logrotate.d/vcached
@@ -14748,14 +15756,10 @@ distclean-uptodate:
 ChangeLog.sed:
                                test "$(srcdir)" != "."
 
-@HAVE_CVS2CL_TRUE@ChangeLog:                   Makefile
-@HAVE_CVS2CL_TRUE@                             if test "$(srcdir)" = "." -a -d CVS; then       \
-@HAVE_CVS2CL_TRUE@                                     $(CVS2CL) $(CVS2CL_ALLFLAGS) -f $@;     \
-@HAVE_CVS2CL_TRUE@                             fi
-@HAVE_CVS2CL_FALSE@@HAVE_RCS2LOG_TRUE@ChangeLog:                       ChangeLog.sed Makefile
-@HAVE_CVS2CL_FALSE@@HAVE_RCS2LOG_TRUE@                         if test "$(srcdir)" = "." -a -d CVS; then       \
-@HAVE_CVS2CL_FALSE@@HAVE_RCS2LOG_TRUE@                                 $(RCS2LOG) -l 0 -c /dev/stdout | sed -f $< >$@; \
-@HAVE_CVS2CL_FALSE@@HAVE_RCS2LOG_TRUE@                         fi
+@HAVE_SVN2CL_TRUE@ChangeLog:                   Makefile
+@HAVE_SVN2CL_TRUE@                             if test "$(srcdir)" = "." -a -d .svn; then      \
+@HAVE_SVN2CL_TRUE@                                     $(SVN2CL) $(SVN2CL_ALLFLAGS) -o $@;     \
+@HAVE_SVN2CL_TRUE@                             fi
 
 .PHONY:        ChangeLog
 
@@ -14773,17 +15777,7 @@ ChangeLog.sed:
                                $(BAD_INC_PATHS))       incflags=;;                             \
                                *)                      incflags='-I$${includedir} ';;          \
                        esac;                                                                   \
-                       sed -e 's!@'PACKAGE'@!$(PACKAGE)!g;                                     \
-                               s!@'VERSION'@!$(VERSION)!g;                                     \
-                               s!@'prefix'@!$(prefix)!g;                                       \
-                               s!@'exec_prefix'@!$(exec_prefix)!g;                             \
-                               s!@'libdir'@!$(libdir)!g;                                       \
-                               s!@'includedir'@!$(includedir)!g;                               \
-                               s!@'libflags"@!$${libflags}$(pkgconf_LIBFLAGS)!g;"'             \
-                               s!@'incflags"@!$${incflags}$(pkgconf_INCFLAGS)!g;"'             \
-                               s!@'pkgincflags"@!$${pkgincflags}$(pkgconf_PKGINCFLAGS)!g;"'    \
-                               s!@'pkgincludedir'@!$(pkgincludedir)!g'                         \
-                        $< >$@
+                       sed -e '$(pkgconf_SUBST)' $< >$@
                        test -z "$(CHMOD_REFERENCE)" || $(CHMOD_REFERENCE) '$<' '$@'
                        chmod a-w $@
 
index 68ae5b0..5ea6bc6 100644 (file)
@@ -7118,7 +7118,6 @@ m4_include([m4/ensc_dietlibc.m4])
 m4_include([m4/ensc_dietlibc_compat.m4])
 m4_include([m4/ensc_e2fscheck.m4])
 m4_include([m4/ensc_initrddir.m4])
-m4_include([m4/ensc_kerneldir.m4])
 m4_include([m4/ensc_pathprog.m4])
 m4_include([m4/ensc_personality.m4])
 m4_include([m4/ensc_release.m4])
index 2fc3acc..917bbc5 100755 (executable)
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2003-06-17'
+timestamp='2005-07-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@ timestamp='2003-06-17'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +68,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )        # Use stdin as input.
@@ -123,7 +125,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
        ;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -136,13 +138,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-## for Red Hat Linux
-if test -f /etc/redhat-release ; then
-    VENDOR=redhat ;
-else
-    VENDOR= ;
-fi
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -203,50 +198,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        # contains redundant information, the shorter form:
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
        echo "${machine}-${os}${release}"
-       exit 0 ;;
-    amiga:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    arc:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    hp300:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mac68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    macppc:OpenBSD:*:*)
-       echo powerpc-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-       echo m88k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-       echo powerpc-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    pmax:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    sgi:OpenBSD:*:*)
-       echo mipseb-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    sun3:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     *:OpenBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
+       UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+       echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+       exit ;;
+    *:ekkoBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+       exit ;;
+    macppc:MirBSD:*:*)
+       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+       exit ;;
+    *:MirBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+       exit ;;
     alpha:OSF1:*:*)
-       if test $UNAME_RELEASE = "V4.0"; then
+       case $UNAME_RELEASE in
+       *4.0)
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-       fi
+               ;;
+       *5.*)
+               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+               ;;
+       esac
        # According to Compaq, /usr/sbin/psrinfo has been available on
        # OSF/1 and Tru64 systems produced since 1995.  I hope that
        # covers most systems running today.  This code pipes the CPU
@@ -284,42 +258,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
            "EV7.9 (21364A)")
                UNAME_MACHINE="alphaev79" ;;
        esac
+       # A Pn.n version is a patched version.
        # A Vn.n version is a released version.
        # A Tn.n version is a released field test version.
        # A Xn.n version is an unreleased experimental baselevel.
        # 1.2 uses "1.2" for uname -r.
-       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-       exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-       echo alpha-hp-vms
-       exit 0 ;;
+       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+       exit ;;
     Alpha\ *:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX subsystem?
        # Should we change UNAME_MACHINE based on the output of uname instead
        # of the specific Alpha model?
        echo alpha-pc-interix
-       exit 0 ;;
+       exit ;;
     21064:Windows_NT:50:3)
        echo alpha-dec-winnt3.5
-       exit 0 ;;
+       exit ;;
     Amiga*:UNIX_System_V:4.0:*)
        echo m68k-unknown-sysv4
-       exit 0;;
+       exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-amigaos
-       exit 0 ;;
+       exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-morphos
-       exit 0 ;;
+       exit ;;
     *:OS/390:*:*)
        echo i370-ibm-openedition
-       exit 0 ;;
+       exit ;;
+    *:z/VM:*:*)
+       echo s390-ibm-zvmoe
+       exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+       exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
-       exit 0;;
+       exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+       echo arm-unknown-riscos
+       exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
        echo hppa1.1-hitachi-hiuxmpp
-       exit 0;;
+       exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
        # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
        if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -327,32 +308,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        else
                echo pyramid-pyramid-bsd
        fi
-       exit 0 ;;
+       exit ;;
     NILE*:*:*:dcosx)
        echo pyramid-pyramid-svr4
-       exit 0 ;;
+       exit ;;
     DRS?6000:unix:4.0:6*)
        echo sparc-icl-nx6
-       exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+       exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
        case `/usr/bin/uname -p` in
-           sparc) echo sparc-icl-nx7 && exit 0 ;;
+           sparc) echo sparc-icl-nx7; exit ;;
        esac ;;
     sun4H:SunOS:5.*:*)
        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit 0 ;;
+       exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit 0 ;;
+       exit ;;
     i86pc:SunOS:5.*:*)
        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit 0 ;;
+       exit ;;
     sun4*:SunOS:6*:*)
        # According to config.sub, this is the proper way to canonicalize
        # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
        # it's likely to be more like Solaris than SunOS4.
        echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit 0 ;;
+       exit ;;
     sun4*:SunOS:*:*)
        case "`/usr/bin/arch -k`" in
            Series*|S4*)
@@ -361,10 +342,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        esac
        # Japanese Language versions have a version number like `4.1.3-JL'.
        echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-       exit 0 ;;
+       exit ;;
     sun3*:SunOS:*:*)
        echo m68k-sun-sunos${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     sun*:*:4.2BSD:*)
        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -376,10 +357,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
                echo sparc-sun-sunos${UNAME_RELEASE}
                ;;
        esac
-       exit 0 ;;
+       exit ;;
     aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -390,37 +371,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    m68k:machten:*:*)
+       echo m68k-apple-machten${UNAME_RELEASE}
+       exit ;;
     powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     RISC*:Mach:*:*)
        echo mips-dec-mach_bsd4.3
-       exit 0 ;;
+       exit ;;
     RISC*:ULTRIX:*:*)
        echo mips-dec-ultrix${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     VAX*:ULTRIX*:*:*)
        echo vax-dec-ultrix${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
        echo clipper-intergraph-clix${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
@@ -444,32 +428,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
          exit (-1);
        }
 EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c \
-         && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-         && exit 0
+       $CC_FOR_BUILD -o $dummy $dummy.c &&
+         dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+         SYSTEM_NAME=`$dummy $dummyarg` &&
+           { echo "$SYSTEM_NAME"; exit; }
        echo mips-mips-riscos${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     Motorola:PowerMAX_OS:*:*)
        echo powerpc-motorola-powermax
-       exit 0 ;;
+       exit ;;
     Motorola:*:4.3:PL8-*)
        echo powerpc-harris-powermax
-       exit 0 ;;
+       exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
        echo powerpc-harris-powermax
-       exit 0 ;;
+       exit ;;
     Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
-       exit 0 ;;
+       exit ;;
     m88k:CX/UX:7*:*)
        echo m88k-harris-cxux7
-       exit 0 ;;
+       exit ;;
     m88k:*:4*:R4*)
        echo m88k-motorola-sysv4
-       exit 0 ;;
+       exit ;;
     m88k:*:3*:R3*)
        echo m88k-motorola-sysv3
-       exit 0 ;;
+       exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -485,29 +470,29 @@ EOF
        else
            echo i586-dg-dgux${UNAME_RELEASE}
        fi
-       exit 0 ;;
+       exit ;;
     M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
        echo m88k-dolphin-sysv3
-       exit 0 ;;
+       exit ;;
     M88*:*:R3*:*)
        # Delta 88k system running SVR3
        echo m88k-motorola-sysv3
-       exit 0 ;;
+       exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
        echo m88k-tektronix-sysv3
-       exit 0 ;;
+       exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
        echo m68k-tektronix-bsd
-       exit 0 ;;
+       exit ;;
     *:IRIX*:*:*)
        echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-       exit 0 ;;
+       exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-       echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-       exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+       echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+       exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
        echo i386-ibm-aix
-       exit 0 ;;
+       exit ;;
     ia64:AIX:*:*)
        if [ -x /usr/bin/oslevel ] ; then
                IBM_REV=`/usr/bin/oslevel`
@@ -515,7 +500,7 @@ EOF
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-       exit 0 ;;
+       exit ;;
     *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
                eval $set_cc_for_build
@@ -530,14 +515,18 @@ EOF
                        exit(0);
                        }
 EOF
-               $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-               echo rs6000-ibm-aix3.2.5
+               if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+               then
+                       echo "$SYSTEM_NAME"
+               else
+                       echo rs6000-ibm-aix3.2.5
+               fi
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4
        else
                echo rs6000-ibm-aix3.2
        fi
-       exit 0 ;;
+       exit ;;
     *:AIX:*:[45])
        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -551,28 +540,28 @@ EOF
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-       exit 0 ;;
+       exit ;;
     *:AIX:*:*)
        echo rs6000-ibm-aix
-       exit 0 ;;
+       exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
        echo romp-ibm-bsd4.4
-       exit 0 ;;
+       exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-       exit 0 ;;                           # report: romp-ibm BSD 4.3
+       exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
        echo rs6000-bull-bosx
-       exit 0 ;;
+       exit ;;
     DPX/2?00:B.O.S.:*:*)
        echo m68k-bull-sysv3
-       exit 0 ;;
+       exit ;;
     9000/[34]??:4.3bsd:1.*:*)
        echo m68k-hp-bsd
-       exit 0 ;;
+       exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
        echo m68k-hp-bsd4.4
-       exit 0 ;;
+       exit ;;
     9000/[34678]??:HP-UX:*:*)
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        case "${UNAME_MACHINE}" in
@@ -634,9 +623,19 @@ EOF
        esac
        if [ ${HP_ARCH} = "hppa2.0w" ]
        then
-           # avoid double evaluation of $set_cc_for_build
-           test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+           eval $set_cc_for_build
+
+           # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+           # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+           # generating 64-bit code.  GNU and HP use different nomenclature:
+           #
+           # $ CC_FOR_BUILD=cc ./config.guess
+           # => hppa2.0w-hp-hpux11.23
+           # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+           # => hppa64-hp-hpux11.23
+
+           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+               grep __LP64__ >/dev/null
            then
                HP_ARCH="hppa2.0w"
            else
@@ -644,11 +643,11 @@ EOF
            fi
        fi
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-       exit 0 ;;
+       exit ;;
     ia64:HP-UX:*:*)
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        echo ia64-hp-hpux${HPUX_REV}
-       exit 0 ;;
+       exit ;;
     3050*:HI-UX:*:*)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
@@ -676,150 +675,166 @@ EOF
          exit (0);
        }
 EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+       $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+               { echo "$SYSTEM_NAME"; exit; }
        echo unknown-hitachi-hiuxwe2
-       exit 0 ;;
+       exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
        echo hppa1.1-hp-bsd
-       exit 0 ;;
+       exit ;;
     9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
-       exit 0 ;;
+       exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
        echo hppa1.0-hp-mpeix
-       exit 0 ;;
+       exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
        echo hppa1.1-hp-osf
-       exit 0 ;;
+       exit ;;
     hp8??:OSF1:*:*)
        echo hppa1.0-hp-osf
-       exit 0 ;;
+       exit ;;
     i*86:OSF1:*:*)
        if [ -x /usr/sbin/sysversion ] ; then
            echo ${UNAME_MACHINE}-unknown-osf1mk
        else
            echo ${UNAME_MACHINE}-unknown-osf1
        fi
-       exit 0 ;;
+       exit ;;
     parisc*:Lites*:*:*)
        echo hppa1.1-hp-lites
-       exit 0 ;;
+       exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
        echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
        if getsysinfo -f scalar_acc
        then echo c32-convex-bsd
        else echo c2-convex-bsd
        fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
        echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
        echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
+       exit ;;
     CRAY*[A-Z]90:*:*:*)
        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
              -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
+       exit ;;
     CRAY*TS:*:*:*)
        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
+       exit ;;
     CRAY*T3E:*:*:*)
        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
+       exit ;;
     CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
+       exit ;;
     *:UNICOS/mp:*:*)
-       echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-       exit 0 ;;
+       echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+       exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     sparc*:BSD/OS:*:*)
        echo sparc-unknown-bsdi${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     *:BSD/OS:*:*)
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-       exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
-       # Determine whether the default compiler uses glibc.
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <features.h>
-       #if __GLIBC__ >= 2
-       LIBC=gnu
-       #else
-       LIBC=
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-       exit 0 ;;
+       exit ;;
+    *:FreeBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+       exit ;;
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
-       exit 0 ;;
+       exit ;;
     i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
-       exit 0 ;;
+       exit ;;
+    i*:windows32*:*)
+       # uname -m includes "-pc" on this system.
+       echo ${UNAME_MACHINE}-mingw32
+       exit ;;
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
-       exit 0 ;;
+       exit ;;
     x86:Interix*:[34]*)
        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-       exit 0 ;;
+       exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
        echo i${UNAME_MACHINE}-pc-mks
-       exit 0 ;;
+       exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX subsystem?
        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
        # UNAME_MACHINE based on the output of uname instead of i386?
        echo i586-pc-interix
-       exit 0 ;;
+       exit ;;
     i*:UWIN*:*)
        echo ${UNAME_MACHINE}-pc-uwin
-       exit 0 ;;
+       exit ;;
+    amd64:CYGWIN*:*:*)
+       echo x86_64-unknown-cygwin
+       exit ;;
     p*:CYGWIN*:*)
        echo powerpcle-unknown-cygwin
-       exit 0 ;;
+       exit ;;
     prep*:SunOS:5.*:*)
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit 0 ;;
+       exit ;;
     *:GNU:*:*)
+       # the GNU system
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-       exit 0 ;;
+       exit ;;
+    *:GNU/*:*:*)
+       # other systems with GNU libc and userland
+       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+       exit ;;
     i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
-       exit 0 ;;
+       exit ;;
     arm*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
+       exit ;;
     cris:Linux:*:*)
        echo cris-axis-linux-gnu
-       exit 0 ;;
+       exit ;;
+    crisv32:Linux:*:*)
+       echo crisv32-axis-linux-gnu
+       exit ;;
+    frv:Linux:*:*)
+       echo frv-unknown-linux-gnu
+       exit ;;
     ia64:Linux:*:*)
-       echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
-       exit 0 ;;
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit ;;
+    m32r*:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit ;;
     m68*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
+       exit ;;
     mips:Linux:*:*)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
@@ -837,7 +852,7 @@ EOF
        #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
     mips64:Linux:*:*)
        eval $set_cc_for_build
@@ -856,14 +871,14 @@ EOF
        #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
     ppc:Linux:*:*)
-       echo powerpc-${VENDOR:-unknown}-linux-gnu
-       exit 0 ;;
+       echo powerpc-unknown-linux-gnu
+       exit ;;
     ppc64:Linux:*:*)
-       echo powerpc64-${VENDOR:-unknown}-linux-gnu
-       exit 0 ;;
+       echo powerpc64-unknown-linux-gnu
+       exit ;;
     alpha:Linux:*:*)
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
          EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -877,7 +892,7 @@ EOF
        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-       exit 0 ;;
+       exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -885,25 +900,25 @@ EOF
          PA8*) echo hppa2.0-unknown-linux-gnu ;;
          *)    echo hppa-unknown-linux-gnu ;;
        esac
-       exit 0 ;;
+       exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
        echo hppa64-unknown-linux-gnu
-       exit 0 ;;
+       exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-       echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
-       exit 0 ;;
+       echo ${UNAME_MACHINE}-ibm-linux
+       exit ;;
     sh64*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
+       exit ;;
     sh*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
+       exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
+       exit ;;
     x86_64:Linux:*:*)
-       echo x86_64-${VENDOR:-unknown}-linux-gnu
-       exit 0 ;;
+       echo x86_64-unknown-linux-gnu
+       exit ;;
     i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
@@ -921,15 +936,15 @@ EOF
                ;;
          a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-               exit 0 ;;
+               exit ;;
          coff-i386)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-               exit 0 ;;
+               exit ;;
          "")
                # Either a pre-BFD a.out linker (linux-gnuoldld) or
                # one that does not give us useful --help.
                echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-               exit 0 ;;
+               exit ;;
        esac
        # Determine whether the default compiler is a.out or elf
        eval $set_cc_for_build
@@ -952,17 +967,23 @@ EOF
        LIBC=gnuaout
        #endif
        #endif
+       #ifdef __dietlibc__
+       LIBC=dietlibc
+       #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-       test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
-       test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+       test x"${LIBC}" != x && {
+               echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+               exit
+       }
+       test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
        ;;
     i*86:DYNIX/ptx:4*:*)
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
        # earlier versions are messed up and put the nodename in both
        # sysname and nodename.
        echo i386-sequent-sysv4
-       exit 0 ;;
+       exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -970,24 +991,27 @@ EOF
        # I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-       exit 0 ;;
+       exit ;;
     i*86:OS/2:*:*)
        # If we were able to find `uname', then EMX Unix compatibility
        # is probably installed.
        echo ${UNAME_MACHINE}-pc-os2-emx
-       exit 0 ;;
+       exit ;;
     i*86:XTS-300:*:STOP)
        echo ${UNAME_MACHINE}-unknown-stop
-       exit 0 ;;
+       exit ;;
     i*86:atheos:*:*)
        echo ${UNAME_MACHINE}-unknown-atheos
-       exit 0 ;;
+       exit ;;
+    i*86:syllable:*:*)
+       echo ${UNAME_MACHINE}-pc-syllable
+       exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
        echo i386-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     i*86:*DOS:*:*)
        echo ${UNAME_MACHINE}-pc-msdosdjgpp
-       exit 0 ;;
+       exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -995,15 +1019,16 @@ EOF
        else
                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
        fi
-       exit 0 ;;
-    i*86:*:5:[78]*)
+       exit ;;
+    i*86:*:5:[678]*)
+       # UnixWare 7.x, OpenUNIX and OpenServer 6.
        case `/bin/uname -X | grep "^Machine"` in
            *486*)           UNAME_MACHINE=i486 ;;
            *Pentium)        UNAME_MACHINE=i586 ;;
            *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
        esac
        echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-       exit 0 ;;
+       exit ;;
     i*86:*:3.2:*)
        if test -f /usr/options/cb.name; then
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1021,73 +1046,73 @@ EOF
        else
                echo ${UNAME_MACHINE}-pc-sysv32
        fi
-       exit 0 ;;
+       exit ;;
     pc:*:*:*)
        # Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
        echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
        echo i386-pc-mach3
-       exit 0 ;;
+       exit ;;
     paragon:*:*:*)
        echo i860-intel-osf1
-       exit 0 ;;
+       exit ;;
     i860:*:4.*:*) # i860-SVR4
        if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
          echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
        else # Add other i860-SVR4 vendors below as they are discovered.
          echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
        fi
-       exit 0 ;;
+       exit ;;
     mini*:CTIX:SYS*5:*)
        # "miniframe"
        echo m68010-convergent-sysv
-       exit 0 ;;
+       exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
        echo m68k-convergent-sysv
-       exit 0 ;;
+       exit ;;
     M680?0:D-NIX:5.3:*)
        echo m68k-diab-dnix
-       exit 0 ;;
-    M68*:*:R3V[567]*:*)
-       test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+       exit ;;
+    M68*:*:R3V[5678]*:*)
+       test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-         && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+         && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-         && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+         && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
        echo m68k-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     mc68030:UNIX_System_V:4.*:*)
        echo m68k-atari-sysv4
-       exit 0 ;;
+       exit ;;
     TSUNAMI:LynxOS:2.*:*)
        echo sparc-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     rs6000:LynxOS:2.*:*)
        echo rs6000-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
        echo powerpc-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     SM[BE]S:UNIX_SV:*:*)
        echo mips-dde-sysv${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     RM*:ReliantUNIX-*:*:*)
        echo mips-sni-sysv4
-       exit 0 ;;
+       exit ;;
     RM*:SINIX-*:*:*)
        echo mips-sni-sysv4
-       exit 0 ;;
+       exit ;;
     *:SINIX-*:*:*)
        if uname -p 2>/dev/null >/dev/null ; then
                UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1095,68 +1120,73 @@ EOF
        else
                echo ns32k-sni-sysv
        fi
-       exit 0 ;;
+       exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
        # From Gerald Hewes <hewes@openmarket.com>.
        # How about differentiating between stratus architectures? -djm
        echo hppa1.1-stratus-sysv4
-       exit 0 ;;
+       exit ;;
     *:*:*:FTX*)
        # From seanf@swdc.stratus.com.
        echo i860-stratus-sysv4
-       exit 0 ;;
+       exit ;;
+    i*86:VOS:*:*)
+       # From Paul.Green@stratus.com.
+       echo ${UNAME_MACHINE}-stratus-vos
+       exit ;;
     *:VOS:*:*)
        # From Paul.Green@stratus.com.
        echo hppa1.1-stratus-vos
-       exit 0 ;;
+       exit ;;
     mc68*:A/UX:*:*)
        echo m68k-apple-aux${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     news*:NEWS-OS:6*:*)
        echo mips-sony-newsos6
-       exit 0 ;;
+       exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
        if [ -d /usr/nec ]; then
                echo mips-nec-sysv${UNAME_RELEASE}
        else
                echo mips-unknown-sysv${UNAME_RELEASE}
        fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
        echo powerpc-be-beos
-       exit 0 ;;
+       exit ;;
     BeMac:BeOS:*:*)    # BeOS running on Mac or Mac clone, PPC only.
        echo powerpc-apple-beos
-       exit 0 ;;
+       exit ;;
     BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
        echo i586-pc-beos
-       exit 0 ;;
+       exit ;;
     SX-4:SUPER-UX:*:*)
        echo sx4-nec-superux${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     SX-5:SUPER-UX:*:*)
        echo sx5-nec-superux${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     SX-6:SUPER-UX:*:*)
        echo sx6-nec-superux${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     *:Rhapsody:*:*)
        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     *:Darwin:*:*)
-       case `uname -p` in
+       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+       case $UNAME_PROCESSOR in
            *86) UNAME_PROCESSOR=i686 ;;
-           powerpc) UNAME_PROCESSOR=powerpc ;;
+           unknown) UNAME_PROCESSOR=powerpc ;;
        esac
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
        UNAME_PROCESSOR=`uname -p`
        if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1164,22 +1194,25 @@ EOF
                UNAME_MACHINE=pc
        fi
        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     *:QNX:*:4*)
        echo i386-pc-qnx
-       exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+       exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+       echo nse-tandem-nsk${UNAME_RELEASE}
+       exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     *:NonStop-UX:*:*)
        echo mips-compaq-nonstopux
-       exit 0 ;;
+       exit ;;
     BS2000:POSIX*:*:*)
        echo bs2000-siemens-sysv
-       exit 0 ;;
+       exit ;;
     DS/*:UNIX_System_V:*:*)
        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
     *:Plan9:*:*)
        # "uname -m" is not consistent, so use $cputype instead. 386
        # is converted to i386 for consistency with other x86
@@ -1190,28 +1223,44 @@ EOF
            UNAME_MACHINE="$cputype"
        fi
        echo ${UNAME_MACHINE}-unknown-plan9
-       exit 0 ;;
+       exit ;;
     *:TOPS-10:*:*)
        echo pdp10-unknown-tops10
-       exit 0 ;;
+       exit ;;
     *:TENEX:*:*)
        echo pdp10-unknown-tenex
-       exit 0 ;;
+       exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
        echo pdp10-dec-tops20
-       exit 0 ;;
+       exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
        echo pdp10-xkl-tops20
-       exit 0 ;;
+       exit ;;
     *:TOPS-20:*:*)
        echo pdp10-unknown-tops20
-       exit 0 ;;
+       exit ;;
     *:ITS:*:*)
        echo pdp10-unknown-its
-       exit 0 ;;
+       exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-       exit 0 ;;
+       exit ;;
+    *:DragonFly:*:*)
+       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+       exit ;;
+    *:*VMS:*:*)
+       UNAME_MACHINE=`(uname -p) 2>/dev/null`
+       case "${UNAME_MACHINE}" in
+           A*) echo alpha-dec-vms ; exit ;;
+           I*) echo ia64-dec-vms ; exit ;;
+           V*) echo vax-dec-vms ; exit ;;
+       esac ;;
+    *:XENIX:*:SysV)
+       echo i386-pc-xenix
+       exit ;;
+    i*86:skyos:*:*)
+       echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+       exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1243,7 +1292,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1332,11 +1381,12 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+       { echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1345,22 +1395,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
        echo c1-convex-bsd
-       exit 0 ;;
+       exit ;;
     c2*)
        if getsysinfo -f scalar_acc
        then echo c32-convex-bsd
        else echo c2-convex-bsd
        fi
-       exit 0 ;;
+       exit ;;
     c34*)
        echo c34-convex-bsd
-       exit 0 ;;
+       exit ;;
     c38*)
        echo c38-convex-bsd
-       exit 0 ;;
+       exit ;;
     c4*)
        echo c4-convex-bsd
-       exit 0 ;;
+       exit ;;
     esac
 fi
 
@@ -1371,7 +1421,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
index 7cee3d6..1c366df 100755 (executable)
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2003-06-18'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2003-06-18'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )        # Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,7 +119,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,7 +146,7 @@ case $os in
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple | -axis)
+       -apple | -axis | -knuth | -cray)
                os=
                basic_machine=$1
                ;;
@@ -228,14 +230,16 @@ case $basic_machine in
        | a29k \
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+       | am33_2.0 \
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+       | bfin \
        | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
        | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
-       | ip2k \
-       | m32r | m68000 | m68k | m88k | mcore \
+       | ip2k | iq2000 \
+       | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
@@ -244,31 +248,37 @@ case $basic_machine in
        | mips64vr4100 | mips64vr4100el \
        | mips64vr4300 | mips64vr4300el \
        | mips64vr5000 | mips64vr5000el \
+       | mips64vr5900 | mips64vr5900el \
        | mipsisa32 | mipsisa32el \
        | mipsisa32r2 | mipsisa32r2el \
        | mipsisa64 | mipsisa64el \
+       | mipsisa64r2 | mipsisa64r2el \
        | mipsisa64sb1 | mipsisa64sb1el \
        | mipsisa64sr71k | mipsisa64sr71kel \
        | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
+       | ms1 \
        | msp430 \
        | ns16k | ns32k \
-       | openrisc | or32 \
+       | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
-       | s390 | s390x \
-       | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
        | sh64 | sh64le \
-       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+       | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+       | sparcv8 | sparcv9 | sparcv9b \
        | strongarm \
        | tahoe | thumb | tic4x | tic80 | tron \
        | v850 | v850e \
        | we32k \
-       | x86 | xscale | xstormy16 | xtensa \
+       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
        | z8k)
                basic_machine=$basic_machine-unknown
                ;;
+       m32c)
+               basic_machine=$basic_machine-unknown
+               ;;
        m6811 | m68hc11 | m6812 | m68hc12)
                # Motorola 68HC11/12.
                basic_machine=$basic_machine-unknown
@@ -296,19 +306,19 @@ case $basic_machine in
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* \
-       | bs2000-* \
+       | bfin-* | bs2000-* \
        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-       | clipper-* | cydra-* \
+       | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
-       | ip2k-* \
-       | m32r-* \
+       | ip2k-* | iq2000-* \
+       | m32r-* | m32rle-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | mcore-* \
+       | m88110-* | m88k-* | maxq-* | mcore-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
@@ -317,34 +327,40 @@ case $basic_machine in
        | mips64vr4100-* | mips64vr4100el-* \
        | mips64vr4300-* | mips64vr4300el-* \
        | mips64vr5000-* | mips64vr5000el-* \
+       | mips64vr5900-* | mips64vr5900el-* \
        | mipsisa32-* | mipsisa32el-* \
        | mipsisa32r2-* | mipsisa32r2el-* \
        | mipsisa64-* | mipsisa64el-* \
+       | mipsisa64r2-* | mipsisa64r2el-* \
        | mipsisa64sb1-* | mipsisa64sb1el-* \
        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
        | mipstx39-* | mipstx39el-* \
+       | mmix-* \
+       | ms1-* \
        | msp430-* \
-       | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+       | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
-       | s390-* | s390x-* \
-       | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-       | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+       | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+       | sparclite-* \
+       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
        | tahoe-* | thumb-* \
        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
        | tron-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
-       | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-       | xtensa-* \
+       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+       | xstormy16-* | xtensa-* \
        | ymp-* \
        | z8k-*)
                ;;
+       m32c-*)
+               ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
        386bsd)
@@ -361,6 +377,9 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-udi
                ;;
+       abacus)
+               basic_machine=abacus-unknown
+               ;;
        adobe68k)
                basic_machine=m68010-adobe
                os=-scout
@@ -378,6 +397,9 @@ case $basic_machine in
        amd64)
                basic_machine=x86_64-pc
                ;;
+       amd64-*)
+               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
        amdahl)
                basic_machine=580-amdahl
                os=-sysv
@@ -437,12 +459,27 @@ case $basic_machine in
                basic_machine=j90-cray
                os=-unicos
                ;;
+       craynv)
+               basic_machine=craynv-cray
+               os=-unicosmp
+               ;;
+       cr16c)
+               basic_machine=cr16c-unknown
+               os=-elf
+               ;;
        crds | unos)
                basic_machine=m68k-crds
                ;;
+       crisv32 | crisv32-* | etraxfs*)
+               basic_machine=crisv32-axis
+               ;;
        cris | cris-* | etrax*)
                basic_machine=cris-axis
                ;;
+       crx)
+               basic_machine=crx-unknown
+               os=-elf
+               ;;
        da30 | da30-*)
                basic_machine=m68k-da30
                ;;
@@ -465,6 +502,10 @@ case $basic_machine in
                basic_machine=m88k-motorola
                os=-sysv3
                ;;
+       djgpp)
+               basic_machine=i586-pc
+               os=-msdosdjgpp
+               ;;
        dpx20 | dpx20-*)
                basic_machine=rs6000-bull
                os=-bosx
@@ -643,10 +684,6 @@ case $basic_machine in
        mips3*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                ;;
-       mmix*)
-               basic_machine=mmix-knuth
-               os=-mmixware
-               ;;
        monitor)
                basic_machine=m68k-rom68k
                os=-coff
@@ -727,10 +764,6 @@ case $basic_machine in
        np1)
                basic_machine=np1-gould
                ;;
-       nv1)
-               basic_machine=nv1-cray
-               os=-unicosmp
-               ;;
        nsr-tandem)
                basic_machine=nsr-tandem
                ;;
@@ -738,9 +771,12 @@ case $basic_machine in
                basic_machine=hppa1.1-oki
                os=-proelf
                ;;
-       or32 | or32-*)
+       openrisc | openrisc-*)
                basic_machine=or32-unknown
-               os=-coff
+               ;;
+       os400)
+               basic_machine=powerpc-ibm
+               os=-os400
                ;;
        OSE68000 | ose68000)
                basic_machine=m68000-ericsson
@@ -833,6 +869,12 @@ case $basic_machine in
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;
+       s390 | s390-*)
+               basic_machine=s390-ibm
+               ;;
+       s390x | s390x-*)
+               basic_machine=s390x-ibm
+               ;;
        sa29200)
                basic_machine=a29k-amd
                os=-udi
@@ -956,6 +998,10 @@ case $basic_machine in
        tower | tower-32)
                basic_machine=m68k-ncr
                ;;
+       tpf)
+               basic_machine=s390x-ibm
+               os=-tpf
+               ;;
        udi29k)
                basic_machine=a29k-amd
                os=-udi
@@ -999,6 +1045,10 @@ case $basic_machine in
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
+       xbox)
+               basic_machine=i686-pc
+               os=-mingw32
+               ;;
        xps | xps100)
                basic_machine=xps100-honeywell
                ;;
@@ -1029,6 +1079,9 @@ case $basic_machine in
        romp)
                basic_machine=romp-ibm
                ;;
+       mmix)
+               basic_machine=mmix-knuth
+               ;;
        rs6000)
                basic_machine=rs6000-ibm
                ;;
@@ -1045,13 +1098,10 @@ case $basic_machine in
        we32k)
                basic_machine=we32k-att
                ;;
-       sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+       sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
                basic_machine=sh-unknown
                ;;
-       sh64)
-               basic_machine=sh64-unknown
-               ;;
-       sparc | sparcv9 | sparcv9b)
+       sparc | sparcv8 | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
        cydra)
@@ -1124,19 +1174,21 @@ case $os in
              | -aos* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+             | -skyos* | -haiku*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1154,12 +1206,15 @@ case $os in
                os=`echo $os | sed -e 's|nto|nto-qnx|'`
                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+             | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                ;;
        -mac*)
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;
+       -linux-dietlibc)
+               os=-linux-dietlibc
+               ;;
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;
@@ -1172,6 +1227,9 @@ case $os in
        -opened*)
                os=-openedition
                ;;
+        -os400*)
+               os=-os400
+               ;;
        -wince*)
                os=-wince
                ;;
@@ -1193,6 +1251,9 @@ case $os in
        -atheos*)
                os=-atheos
                ;;
+       -syllable*)
+               os=-syllable
+               ;;
        -386bsd)
                os=-bsd
                ;;
@@ -1215,6 +1276,9 @@ case $os in
        -sinix*)
                os=-sysv4
                ;;
+        -tpf*)
+               os=-tpf
+               ;;
        -triton*)
                os=-sysv3
                ;;
@@ -1251,6 +1315,9 @@ case $os in
        -kaos*)
                os=-kaos
                ;;
+       -zvmoe)
+               os=-zvmoe
+               ;;
        -none)
                ;;
        *)
@@ -1282,9 +1349,9 @@ case $basic_machine in
        arm*-semi)
                os=-aout
                ;;
-       c4x-* | tic4x-*)
-               os=-coff
-               ;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
        # This must come before the *-dec entry.
        pdp10-*)
                os=-tops20
@@ -1328,9 +1395,15 @@ case $basic_machine in
        *-be)
                os=-beos
                ;;
+       *-haiku)
+               os=-haiku
+               ;;
        *-ibm)
                os=-aix
                ;;
+       *-knuth)
+               os=-mmixware
+               ;;
        *-wec)
                os=-proelf
                ;;
@@ -1463,9 +1536,15 @@ case $basic_machine in
                        -mvs* | -opened*)
                                vendor=ibm
                                ;;
+                       -os400*)
+                               vendor=ibm
+                               ;;
                        -ptx*)
                                vendor=sequent
                                ;;
+                       -tpf*)
+                               vendor=ibm
+                               ;;
                        -vxsim* | -vxworks* | -windiss*)
                                vendor=wrs
                                ;;
@@ -1490,7 +1569,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
index 51116e7..e493b5e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for util-vserver 0.30.208.
+# Generated by GNU Autoconf 2.59 for util-vserver 0.30.212.
 #
-# Report bugs to <enrico.scholz@informatik.tu-chemnitz.de>.
+# Report bugs to <vserver@list.linux-vserver.org>.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -423,9 +423,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='util-vserver'
 PACKAGE_TARNAME='util-vserver'
-PACKAGE_VERSION='0.30.208'
-PACKAGE_STRING='util-vserver 0.30.208'
-PACKAGE_BUGREPORT='enrico.scholz@informatik.tu-chemnitz.de'
+PACKAGE_VERSION='0.30.212'
+PACKAGE_STRING='util-vserver 0.30.212'
+PACKAGE_BUGREPORT='vserver@list.linux-vserver.org'
 
 ac_unique_file="src/capchroot.c"
 # Factoring default headers for most tests.
@@ -465,7 +465,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os GPG_KEY CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir ENSC_HAVE_CXX_COMPILER_TRUE ENSC_HAVE_CXX_COMPILER_FALSE ENSC_HAVE_C99_COMPILER_TRUE ENSC_HAVE_C99_COMPILER_FALSE ENSC_PATHPROG_SED CAT CHOWN CMP CP DIRNAME EGREP ENV GREP LN MKDIR MKFIFO MKTEMP MOUNT MV NICE PS RM RMDIR SED SH TAC TAR TOUCH TTY UMOUNT WC IP IPTABLES MODPROBE NAMEIF NOHUP RMMOD VCONFIG WGET DOXYGEN XSLTP XSLTPROC HAVE_XSLTP_TRUE HAVE_XSLTP_FALSE HAVE_XSLTPROC_TRUE HAVE_XSLTPROC_FALSE LIB_DEBUG_CPPFLAGS ENSC_USE_EXPENSIVE_TESTS initrddir RELEASE_CPPFLAGS DIET DIETFLAGS USE_DIETLIBC_TRUE USE_DIETLIBC_FALSE USE_DIETLIBC_COMPAT_TRUE USE_DIETLIBC_COMPAT_FALSE ENSC_USE_DIETLIBC_TRUE ENSC_USE_DIETLIBC_FALSE ENSC_USE_GLIBC_TRUE ENSC_USE_GLIBC_FALSE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL kernelincludedir vserverdir CVS2CL_TAG CVS2CL HAVE_CVS2CL_TRUE HAVE_CVS2CL_FALSE RCS2LOG HAVE_RCS2LOG_TRUE HAVE_RCS2LOG_FALSE ENSC_ENABLE_INTERNAL_HEADERS_TRUE ENSC_ENABLE_INTERNAL_HEADERS_FALSE ENSC_HAVE_BEECRYPT_TRUE ENSC_HAVE_BEECRYPT_FALSE ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os GPG_KEY CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir ENSC_HAVE_CXX_COMPILER_TRUE ENSC_HAVE_CXX_COMPILER_FALSE ENSC_HAVE_C99_COMPILER_TRUE ENSC_HAVE_C99_COMPILER_FALSE ENSC_PATHPROG_SED CAT CHOWN CMP CP DIRNAME EGREP ENV GREP LN MKDIR MKFIFO MKTEMP MOUNT MV NICE PS RM RMDIR SED SH TAC TAR TOUCH TTY UMOUNT WC IP IPTABLES MODPROBE NAMEIF NOHUP RMMOD VCONFIG WGET FILE GZIP BZIP2 CPIO RESTORE RSYNC DOXYGEN XSLTP XSLTPROC HAVE_XSLTP_TRUE HAVE_XSLTP_FALSE HAVE_XSLTPROC_TRUE HAVE_XSLTPROC_FALSE LIB_DEBUG_CPPFLAGS ENSC_USE_EXPENSIVE_TESTS initrddir RELEASE_CPPFLAGS DIET DIETFLAGS USE_DIETLIBC_TRUE USE_DIETLIBC_FALSE USE_DIETLIBC_COMPAT_TRUE USE_DIETLIBC_COMPAT_FALSE ENSC_USE_DIETLIBC_TRUE ENSC_USE_DIETLIBC_FALSE ENSC_USE_GLIBC_TRUE ENSC_USE_GLIBC_FALSE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL vserverdir SVN2CL HAVE_SVN2CL_TRUE HAVE_SVN2CL_FALSE ENSC_ENABLE_INTERNAL_HEADERS_TRUE ENSC_ENABLE_INTERNAL_HEADERS_FALSE ENSC_HAVE_BEECRYPT_TRUE ENSC_HAVE_BEECRYPT_FALSE ENSC_CAN_BEECRYPT_WITH_DIETLIBC_TRUE ENSC_CAN_BEECRYPT_WITH_DIETLIBC_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -962,7 +962,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures util-vserver 0.30.208 to adapt to many kinds of systems.
+\`configure' configures util-vserver 0.30.212 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1028,7 +1028,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of util-vserver 0.30.208:";;
+     short | recursive ) echo "Configuration of util-vserver 0.30.212:";;
    esac
   cat <<\_ACEOF
 
@@ -1043,7 +1043,7 @@ Optional Features:
                           disable certain extra optimizations (default: no)
   --enable-lib-debug      enable additional debug code in library (default:
                           no)
-  --disable-expensive-tests
+  --enable-expensive-tests
                           disable tests which might be expensive on some
                           systems (default: no)
   --enable-release        enable release mode (default: no)
@@ -1063,8 +1063,8 @@ Optional Features:
                           use vserver specific headers from the kernel instead
                           of the shipped versions (default: no)
   --enable-apis=APIS      enable support for the given apis; possible values
-                          are: legacy,compat,v11,v13,fscompat,net,ALL
-                          (default: all except 'legacy')
+                          are: legacy,compat,v11,fscompat,v13obs,v13,net,
+                          ALL,NOLEGACY (default: v13,net,v21)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1076,8 +1076,6 @@ Optional Packages:
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
-  --with-kerneldir=DIR    assume kernelsources in DIR (default:
-                          /lib/modules/<current>/build)
   --with-vrootdir=DIR     place vservers under DIR (default: /vservers)
   --with-syscall=METHOD   call syscall(2) with the specified METHOD; valid
                           values are 'fast', 'traditional' and 'auto'
@@ -1102,7 +1100,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <enrico.scholz@informatik.tu-chemnitz.de>.
+Report bugs to <vserver@list.linux-vserver.org>.
 _ACEOF
 fi
 
@@ -1198,7 +1196,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-util-vserver configure 0.30.208
+util-vserver configure 0.30.212
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1212,7 +1210,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by util-vserver $as_me 0.30.208, which was
+It was created by util-vserver $as_me 0.30.212, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1851,7 +1849,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='util-vserver'
- VERSION='0.30.208'
+ VERSION='0.30.212'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4732,6 +4730,8 @@ Can not find the 'egrep' tool within '${ensc_searchpath:-$PATH}'.
        test "${EGREP}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'EGREP'@!${EGREP}!g;"
 
        test "${EGREP}"
+       env_old_searchpath="${ensc_searchpath}"
+       ensc_searchpath="/bin:${ensc_searchpath:-$PATH}"
 
 
 
@@ -4813,6 +4813,7 @@ Can not find the 'env' tool within '${ensc_searchpath:-$PATH}'.
        test "${ENV}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'ENV'@!${ENV}!g;"
 
        test "${ENV}"
+       ensc_searchpath="${env_old_searchpath}"
 
 
 
@@ -7006,6 +7007,492 @@ Can not find the 'wget' tool within '${ensc_searchpath:-$PATH}'.
 
 
 
+       if test -z "file"; then
+               rq=true
+       else
+               rq=false
+       fi
+
+       if $rq; then
+               ensc_dflt=
+       else
+               ensc_dflt="file"
+       fi
+
+       for ac_prog in file
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_FILE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $FILE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FILE="$FILE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ensc_searchpath
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+FILE=$ac_cv_path_FILE
+
+if test -n "$FILE"; then
+  echo "$as_me:$LINENO: result: $FILE" >&5
+echo "${ECHO_T}$FILE" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$FILE" && break
+done
+test -n "$FILE" || FILE="$ensc_dflt"
+
+
+       if test -z "${FILE}" && $rq; then
+               if test -z ""; then
+                       { { echo "$as_me:$LINENO: error: Can not find the 'file' tool within '${ensc_searchpath:-$PATH}'." >&5
+echo "$as_me: error: Can not find the 'file' tool within '${ensc_searchpath:-$PATH}'." >&2;}
+   { (exit 1); exit 1; }; }
+               else
+                       { { echo "$as_me:$LINENO: error:
+Can not find the 'file' tool within '${ensc_searchpath:-$PATH}'.
+" >&5
+echo "$as_me: error:
+Can not find the 'file' tool within '${ensc_searchpath:-$PATH}'.
+" >&2;}
+   { (exit 1); exit 1; }; }
+               fi
+       fi
+
+       test "${FILE}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'FILE'@!${FILE}!g;"
+
+       test "${FILE}"
+
+
+
+
+       if test -z "gzip"; then
+               rq=true
+       else
+               rq=false
+       fi
+
+       if $rq; then
+               ensc_dflt=
+       else
+               ensc_dflt="gzip"
+       fi
+
+       for ac_prog in gzip
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GZIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $GZIP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ensc_searchpath
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+GZIP=$ac_cv_path_GZIP
+
+if test -n "$GZIP"; then
+  echo "$as_me:$LINENO: result: $GZIP" >&5
+echo "${ECHO_T}$GZIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$GZIP" && break
+done
+test -n "$GZIP" || GZIP="$ensc_dflt"
+
+
+       if test -z "${GZIP}" && $rq; then
+               if test -z ""; then
+                       { { echo "$as_me:$LINENO: error: Can not find the 'gzip' tool within '${ensc_searchpath:-$PATH}'." >&5
+echo "$as_me: error: Can not find the 'gzip' tool within '${ensc_searchpath:-$PATH}'." >&2;}
+   { (exit 1); exit 1; }; }
+               else
+                       { { echo "$as_me:$LINENO: error:
+Can not find the 'gzip' tool within '${ensc_searchpath:-$PATH}'.
+" >&5
+echo "$as_me: error:
+Can not find the 'gzip' tool within '${ensc_searchpath:-$PATH}'.
+" >&2;}
+   { (exit 1); exit 1; }; }
+               fi
+       fi
+
+       test "${GZIP}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'GZIP'@!${GZIP}!g;"
+
+       test "${GZIP}"
+
+
+
+
+       if test -z "bzip2"; then
+               rq=true
+       else
+               rq=false
+       fi
+
+       if $rq; then
+               ensc_dflt=
+       else
+               ensc_dflt="bzip2"
+       fi
+
+       for ac_prog in bzip2
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_BZIP2+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $BZIP2 in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ensc_searchpath
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+BZIP2=$ac_cv_path_BZIP2
+
+if test -n "$BZIP2"; then
+  echo "$as_me:$LINENO: result: $BZIP2" >&5
+echo "${ECHO_T}$BZIP2" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$BZIP2" && break
+done
+test -n "$BZIP2" || BZIP2="$ensc_dflt"
+
+
+       if test -z "${BZIP2}" && $rq; then
+               if test -z ""; then
+                       { { echo "$as_me:$LINENO: error: Can not find the 'bzip2' tool within '${ensc_searchpath:-$PATH}'." >&5
+echo "$as_me: error: Can not find the 'bzip2' tool within '${ensc_searchpath:-$PATH}'." >&2;}
+   { (exit 1); exit 1; }; }
+               else
+                       { { echo "$as_me:$LINENO: error:
+Can not find the 'bzip2' tool within '${ensc_searchpath:-$PATH}'.
+" >&5
+echo "$as_me: error:
+Can not find the 'bzip2' tool within '${ensc_searchpath:-$PATH}'.
+" >&2;}
+   { (exit 1); exit 1; }; }
+               fi
+       fi
+
+       test "${BZIP2}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'BZIP2'@!${BZIP2}!g;"
+
+       test "${BZIP2}"
+
+
+
+
+       if test -z "cpio"; then
+               rq=true
+       else
+               rq=false
+       fi
+
+       if $rq; then
+               ensc_dflt=
+       else
+               ensc_dflt="cpio"
+       fi
+
+       for ac_prog in cpio
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_CPIO+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $CPIO in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ensc_searchpath
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+CPIO=$ac_cv_path_CPIO
+
+if test -n "$CPIO"; then
+  echo "$as_me:$LINENO: result: $CPIO" >&5
+echo "${ECHO_T}$CPIO" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$CPIO" && break
+done
+test -n "$CPIO" || CPIO="$ensc_dflt"
+
+
+       if test -z "${CPIO}" && $rq; then
+               if test -z ""; then
+                       { { echo "$as_me:$LINENO: error: Can not find the 'cpio' tool within '${ensc_searchpath:-$PATH}'." >&5
+echo "$as_me: error: Can not find the 'cpio' tool within '${ensc_searchpath:-$PATH}'." >&2;}
+   { (exit 1); exit 1; }; }
+               else
+                       { { echo "$as_me:$LINENO: error:
+Can not find the 'cpio' tool within '${ensc_searchpath:-$PATH}'.
+" >&5
+echo "$as_me: error:
+Can not find the 'cpio' tool within '${ensc_searchpath:-$PATH}'.
+" >&2;}
+   { (exit 1); exit 1; }; }
+               fi
+       fi
+
+       test "${CPIO}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'CPIO'@!${CPIO}!g;"
+
+       test "${CPIO}"
+
+
+
+
+       if test -z "restore"; then
+               rq=true
+       else
+               rq=false
+       fi
+
+       if $rq; then
+               ensc_dflt=
+       else
+               ensc_dflt="restore"
+       fi
+
+       for ac_prog in restore
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_RESTORE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $RESTORE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RESTORE="$RESTORE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ensc_searchpath
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_RESTORE="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+RESTORE=$ac_cv_path_RESTORE
+
+if test -n "$RESTORE"; then
+  echo "$as_me:$LINENO: result: $RESTORE" >&5
+echo "${ECHO_T}$RESTORE" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$RESTORE" && break
+done
+test -n "$RESTORE" || RESTORE="$ensc_dflt"
+
+
+       if test -z "${RESTORE}" && $rq; then
+               if test -z ""; then
+                       { { echo "$as_me:$LINENO: error: Can not find the 'restore' tool within '${ensc_searchpath:-$PATH}'." >&5
+echo "$as_me: error: Can not find the 'restore' tool within '${ensc_searchpath:-$PATH}'." >&2;}
+   { (exit 1); exit 1; }; }
+               else
+                       { { echo "$as_me:$LINENO: error:
+Can not find the 'restore' tool within '${ensc_searchpath:-$PATH}'.
+" >&5
+echo "$as_me: error:
+Can not find the 'restore' tool within '${ensc_searchpath:-$PATH}'.
+" >&2;}
+   { (exit 1); exit 1; }; }
+               fi
+       fi
+
+       test "${RESTORE}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'RESTORE'@!${RESTORE}!g;"
+
+       test "${RESTORE}"
+
+
+
+
+       if test -z "rsync"; then
+               rq=true
+       else
+               rq=false
+       fi
+
+       if $rq; then
+               ensc_dflt=
+       else
+               ensc_dflt="rsync"
+       fi
+
+       for ac_prog in rsync
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_RSYNC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $RSYNC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RSYNC="$RSYNC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $ensc_searchpath
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_RSYNC="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+RSYNC=$ac_cv_path_RSYNC
+
+if test -n "$RSYNC"; then
+  echo "$as_me:$LINENO: result: $RSYNC" >&5
+echo "${ECHO_T}$RSYNC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$RSYNC" && break
+done
+test -n "$RSYNC" || RSYNC="$ensc_dflt"
+
+
+       if test -z "${RSYNC}" && $rq; then
+               if test -z ""; then
+                       { { echo "$as_me:$LINENO: error: Can not find the 'rsync' tool within '${ensc_searchpath:-$PATH}'." >&5
+echo "$as_me: error: Can not find the 'rsync' tool within '${ensc_searchpath:-$PATH}'." >&2;}
+   { (exit 1); exit 1; }; }
+               else
+                       { { echo "$as_me:$LINENO: error:
+Can not find the 'rsync' tool within '${ensc_searchpath:-$PATH}'.
+" >&5
+echo "$as_me: error:
+Can not find the 'rsync' tool within '${ensc_searchpath:-$PATH}'.
+" >&2;}
+   { (exit 1); exit 1; }; }
+               fi
+       fi
+
+       test "${RSYNC}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'RSYNC'@!${RSYNC}!g;"
+
+       test "${RSYNC}"
+
+
+
+
 
        if test -z ":"; then
                rq=true
@@ -7269,6 +7756,9 @@ else
 fi
 
 
+if test x"$prefix" = x/; then
+       prefix=
+fi
 
 
 
@@ -7559,12 +8049,12 @@ if test "${enable_expensive_tests+set}" = set; then
   enableval="$enable_expensive_tests"
   case "$enableval" in
                 (yes|no)  use_expensive_tests=$enableval;;
-                (*)       { { echo "$as_me:$LINENO: error: '$enableval' is not a valid value for '--disable-expensive-tests'" >&5
-echo "$as_me: error: '$enableval' is not a valid value for '--disable-expensive-tests'" >&2;}
+                (*)       { { echo "$as_me:$LINENO: error: '$enableval' is not a valid value for '--enable-expensive-tests'" >&5
+echo "$as_me: error: '$enableval' is not a valid value for '--enable-expensive-tests'" >&2;}
    { (exit 1); exit 1; }; };;
               esac
 else
-   use_expensive_tests=yes
+   use_expensive_tests=no
 fi;
 echo "$as_me:$LINENO: result: $use_expensive_tests" >&5
 echo "${ECHO_T}$use_expensive_tests" >&6
@@ -9628,6 +10118,7 @@ echo "${ECHO_T}$ensc_release_mode" >&6
 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;;
        (*)             min_diet_ver=0.28;;
 esac
 
@@ -10627,7 +11118,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 10630 "configure"' > conftest.$ac_ext
+  echo '#line 11121 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11384,9 +11875,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------------------------ ##
-## Report this to enrico.scholz@informatik.tu-chemnitz.de ##
-## ------------------------------------------------------ ##
+## --------------------------------------------- ##
+## Report this to vserver@list.linux-vserver.org ##
+## --------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -11734,7 +12225,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:11737:" \
+echo "$as_me:12228:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -12768,11 +13259,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12771: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13262: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12775: \$? = $ac_status" >&5
+   echo "$as_me:13266: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13001,11 +13492,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13004: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13495: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13008: \$? = $ac_status" >&5
+   echo "$as_me:13499: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13061,11 +13552,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13064: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13555: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13068: \$? = $ac_status" >&5
+   echo "$as_me:13559: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14395,7 +14886,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 14398 "configure"' > conftest.$ac_ext
+    echo '#line 14889 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15266,7 +15757,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15269 "configure"
+#line 15760 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15364,7 +15855,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15367 "configure"
+#line 15858 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17543,11 +18034,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17546: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18037: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17550: \$? = $ac_status" >&5
+   echo "$as_me:18041: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17603,11 +18094,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17606: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18097: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17610: \$? = $ac_status" >&5
+   echo "$as_me:18101: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18114,7 +18605,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 18117 "configure"' > conftest.$ac_ext
+    echo '#line 18608 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -18985,7 +19476,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18988 "configure"
+#line 19479 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19083,7 +19574,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19086 "configure"
+#line 19577 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19910,11 +20401,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19913: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20404: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19917: \$? = $ac_status" >&5
+   echo "$as_me:20408: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -19970,11 +20461,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19973: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20464: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19977: \$? = $ac_status" >&5
+   echo "$as_me:20468: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21284,7 +21775,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 21287 "configure"' > conftest.$ac_ext
+    echo '#line 21778 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -22025,11 +22516,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:22028: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22519: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:22032: \$? = $ac_status" >&5
+   echo "$as_me:22523: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -22258,11 +22749,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:22261: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22752: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:22265: \$? = $ac_status" >&5
+   echo "$as_me:22756: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -22318,11 +22809,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:22321: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22812: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:22325: \$? = $ac_status" >&5
+   echo "$as_me:22816: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -23652,7 +24143,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 23655 "configure"' > conftest.$ac_ext
+    echo '#line 24146 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -24523,7 +25014,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 24526 "configure"
+#line 25017 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -24621,7 +25112,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 24624 "configure"
+#line 25115 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -25604,31 +26095,17 @@ echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
 echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
    { (exit 1); exit 1; }; }
   fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
+fi
 
 
 
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
+# Prevent multiple expansion
 
 
 
@@ -25638,58 +26115,18 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
-       echo "$as_me:$LINENO: checking for linux kernel dir" >&5
-echo $ECHO_N "checking for linux kernel dir... $ECHO_C" >&6
-if test "${ensc_cv_path_kerneldir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
 
-# Check whether --with-kerneldir or --without-kerneldir was given.
-if test "${with_kerneldir+set}" = set; then
-  withval="$with_kerneldir"
-  case "$withval" in
-               yes|no) { { echo "$as_me:$LINENO: error: '$withval' is not a valid value for kerneldir" >&5
-echo "$as_me: error: '$withval' is not a valid value for kerneldir" >&2;}
-   { (exit 1); exit 1; }; };;
-               *)      ensc_cv_path_kerneldir=$withval;;
-            esac
-else
-  ensc_cv_path_kerneldir=
-            for i in /lib/modules/$(uname -r)/build /usr/src/linux /usr; do
-               test -e $i/include/linux/version.h && { ensc_cv_path_kerneldir=$i; break; }
-            done
-fi;
 
-fi
-echo "$as_me:$LINENO: result: $ensc_cv_path_kerneldir" >&5
-echo "${ECHO_T}$ensc_cv_path_kerneldir" >&6
 
-       test "$ensc_cv_path_kerneldir" -a -e "$ensc_cv_path_kerneldir"/include/linux/version.h || {
-               { { echo "$as_me:$LINENO: error: Can not find kernelsources" >&5
-echo "$as_me: error: Can not find kernelsources" >&2;}
-   { (exit 1); exit 1; }; }
-       }
 
 
 
 
-       echo "$as_me:$LINENO: checking for linux kernel headers" >&5
-echo $ECHO_N "checking for linux kernel headers... $ECHO_C" >&6
-if test "${ensc_cv_path_kernelheaders+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-               ensc_cv_path_kernelheaders=$ensc_cv_path_kerneldir/include
 
-fi
-echo "$as_me:$LINENO: result: $ensc_cv_path_kernelheaders" >&5
-echo "${ECHO_T}$ensc_cv_path_kernelheaders" >&6
 
-       if test x"kernelincludedir" != x; then
-               kernelincludedir=$ensc_cv_path_kernelheaders
 
-       fi
 
 
        echo "$as_me:$LINENO: checking which vserver-rootdir is to use" >&5
@@ -25716,73 +26153,17 @@ echo "${ECHO_T}$ensc_uv_path_vrootdir" >&6
        fi
 
 
-       if test x"trunk" != x; then
-               CVS2CL_TAG='-F trunk'
-
-       fi
-
-       for ac_prog in cvs2cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CVS2CL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CVS2CL"; then
-  ac_cv_prog_CVS2CL="$CVS2CL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CVS2CL="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CVS2CL=$ac_cv_prog_CVS2CL
-if test -n "$CVS2CL"; then
-  echo "$as_me:$LINENO: result: $CVS2CL" >&5
-echo "${ECHO_T}$CVS2CL" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$CVS2CL" && break
-done
-
-
-
-if test x"$CVS2CL" != x; then
-  HAVE_CVS2CL_TRUE=
-  HAVE_CVS2CL_FALSE='#'
-else
-  HAVE_CVS2CL_TRUE='#'
-  HAVE_CVS2CL_FALSE=
-fi
-
-
-       for ac_prog in rcs2log
+       for ac_prog in svn2cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RCS2LOG+set}" = set; then
+if test "${ac_cv_prog_SVN2CL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$RCS2LOG"; then
-  ac_cv_prog_RCS2LOG="$RCS2LOG" # Let the user override the test.
+  if test -n "$SVN2CL"; then
+  ac_cv_prog_SVN2CL="$SVN2CL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -25791,7 +26172,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RCS2LOG="$ac_prog"
+    ac_cv_prog_SVN2CL="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -25800,26 +26181,26 @@ done
 
 fi
 fi
-RCS2LOG=$ac_cv_prog_RCS2LOG
-if test -n "$RCS2LOG"; then
-  echo "$as_me:$LINENO: result: $RCS2LOG" >&5
-echo "${ECHO_T}$RCS2LOG" >&6
+SVN2CL=$ac_cv_prog_SVN2CL
+if test -n "$SVN2CL"; then
+  echo "$as_me:$LINENO: result: $SVN2CL" >&5
+echo "${ECHO_T}$SVN2CL" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-  test -n "$RCS2LOG" && break
+  test -n "$SVN2CL" && break
 done
 
 
 
-if test x"$RCS2LOG" != x; then
-  HAVE_RCS2LOG_TRUE=
-  HAVE_RCS2LOG_FALSE='#'
+if test x"$SVN2CL" != x; then
+  HAVE_SVN2CL_TRUE=
+  HAVE_SVN2CL_FALSE='#'
 else
-  HAVE_RCS2LOG_TRUE='#'
-  HAVE_RCS2LOG_FALSE=
+  HAVE_SVN2CL_TRUE='#'
+  HAVE_SVN2CL_FALSE=
 fi
 
 
 echo "$as_me:$LINENO: result: $enable_internal_headers" >&5
 echo "${ECHO_T}$enable_internal_headers" >&6
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 echo "$as_me:$LINENO: checking for supported APIs" >&5
 echo $ECHO_N "checking for supported APIs... $ECHO_C" >&6
 # Check whether --enable-apis or --disable-apis was given.
@@ -25860,55 +26262,65 @@ if test "${enable_apis+set}" = set; then
   enableval="$enable_apis"
 
 else
-  enable_apis=compat,v11,v13,fscompat,net
+  enable_apis=v13,net,v21
 fi;
 
-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'
+test x"$enable_apis" != xNOLEGACY || enable_apis='compat,v11,fscompat,v13,net,v21'
 enable_api_oldproc=
 enable_api_olduts=
 old_IFS=$IFS
 IFS=,;
+
 for i in $enable_apis; do
        case "$i" in
-               (compat)
-cat >>confdefs.h <<\_ACEOF
+               (compat)        cat >>confdefs.h <<\_ACEOF
 #define VC_ENABLE_API_COMPAT 1
 _ACEOF
 
-                               enable_api_oldproc=1
-                               enable_api_olduts=1
+                               enable_api_oldproc=${enable_api_oldproc:-1}
+                               enable_api_olduts=${enable_api_olduts:-1}
                                ;;
-               (legacy)
-cat >>confdefs.h <<\_ACEOF
+               (legacy)        cat >>confdefs.h <<\_ACEOF
 #define VC_ENABLE_API_LEGACY 1
 _ACEOF
 
-                               enable_api_old_proc=1
-                               enable_api_olduts=1
+                               enable_api_oldproc=${enable_api_oldproc:-1}
+                               enable_api_olduts=${enable_api_olduts:-1}
                                ;;
-               (v11)
-cat >>confdefs.h <<\_ACEOF
+               (v11)           cat >>confdefs.h <<\_ACEOF
 #define VC_ENABLE_API_V11 1
 _ACEOF
 
-                               enable_api_oldproc=1
-                               enable_api_olduts=1
+                               enable_api_oldproc=${enable_api_oldproc:-1}
+                               enable_api_olduts=${enable_api_olduts:-1}
                                ;;
-               (v13)
-cat >>confdefs.h <<\_ACEOF
+               (fscompat)      cat >>confdefs.h <<\_ACEOF
+#define VC_ENABLE_API_FSCOMPAT 1
+_ACEOF
+;;
+               (v13obs)        cat >>confdefs.h <<\_ACEOF
+#define VC_ENABLE_API_V13OBS 1
+_ACEOF
+
+                               cat >>confdefs.h <<\_ACEOF
 #define VC_ENABLE_API_V13 1
 _ACEOF
 ;;
-               (net)
-cat >>confdefs.h <<\_ACEOF
+               (v13)           cat >>confdefs.h <<\_ACEOF
+#define VC_ENABLE_API_V13 1
+_ACEOF
+;;
+               (net)           cat >>confdefs.h <<\_ACEOF
 #define VC_ENABLE_API_NET 1
 _ACEOF
 ;;
-               (fscompat)
-cat >>confdefs.h <<\_ACEOF
-#define VC_ENABLE_API_FSCOMPAT 1
+               (v21)           cat >>confdefs.h <<\_ACEOF
+#define VC_ENABLE_API_V21 1
 _ACEOF
 ;;
+               (oldproc)       enable_api_oldproc=2;;
+               (olduts)        enable_api_olduts=2;;
                (*)             { { echo "$as_me:$LINENO: error: '$i' is not a supported API" >&5
 echo "$as_me: error: '$i' is not a supported API" >&2;}
    { (exit 1); exit 1; }; };;
@@ -25916,20 +26328,18 @@ echo "$as_me: error: '$i' is not a supported API" >&2;}
 done
 IFS=$old_IFS
 if test x"$enable_api_oldproc" != x; then
-
-cat >>confdefs.h <<\_ACEOF
+       cat >>confdefs.h <<\_ACEOF
 #define VC_ENABLE_API_OLDPROC 1
 _ACEOF
 
-       enable_apis="$enable_apis,oldproc"
+       test x"$enable_api_oldproc" != x2 && enable_apis="$enable_apis,oldproc"
 fi
 if test x"$enable_api_olduts" != x; then
-
-cat >>confdefs.h <<\_ACEOF
+       cat >>confdefs.h <<\_ACEOF
 #define VC_ENABLE_API_OLDUTS 1
 _ACEOF
 
-       enable_apis="$enable_apis,olduts"
+       test x"$enable_api_olduts" != x2 && enable_apis="$enable_apis,olduts"
 fi
 echo "$as_me:$LINENO: result: $enable_apis" >&5
 echo "${ECHO_T}$enable_apis" >&6
@@ -25939,7 +26349,6 @@ echo "${ECHO_T}$enable_apis" >&6
 
 
 
-
        echo "$as_me:$LINENO: checking for number of syscall 'vserver'" >&5
 echo $ECHO_N "checking for number of syscall 'vserver'... $ECHO_C" >&6
 if test "${ensc_cv_value_syscall_vserver+set}" = set; then
@@ -25954,7 +26363,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
                cat >conftest.$ac_ext <<_ACEOF
 
-#include <asm/unistd.h>
+#ifdef ENSC_SYSCALL_FALLBACK
+#  include ENSC_SYSCALL_FALLBACK
+#else
+#  include <asm/unistd.h>
+#endif
 #ifdef __NR_vserver
 ensc_syscall_tmp_nr=__NR_vserver;
 ensc_syscall_tmp_src=ENSC_MARK
@@ -25963,10 +26376,10 @@ ensc_syscall_tmp_src=ENSC_MARK
 _ACEOF
                ensc_syscall_tmp_nr=
                ensc_syscall_tmp_src=
-               test "$ensc_syscall_tmp_nr" || \
-                       eval $($CPP $CPPFLAGS -D ENSC_MARK='glibc'                                 conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[1-9][0-9]*;|src=.*)$')
-               test "$ensc_syscall_tmp_nr" || \
-                       eval $($CPP $CPPFLAGS -D ENSC_MARK='kernel' -I $ensc_cv_path_kernelheaders conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[1-9][0-9]*;|src=.*)$')
+               test x"$ensc_syscall_tmp_nr" != x || \
+                       eval $($CPP $CPPFLAGS -D ENSC_MARK='glibc'                                    conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[1-9][0-9]*;|src=.*)$')
+               test x"$ensc_syscall_tmp_nr" != x -o x'lib/syscall-fallback.h' = x || \
+                       eval $($CPP $CPPFLAGS -D ENSC_MARK='fallback' -D ENSC_SYSCALL_FALLBACK='"lib/syscall-fallback.h"' conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[1-9][0-9]*;|src=.*)$')
                test "$ensc_syscall_tmp_nr" || {
                        ensc_syscall_tmp_nr=273
                        ensc_syscall_tmp_src=default
@@ -26004,7 +26417,6 @@ _ACEOF
 
 
 
-
         echo "$as_me:$LINENO: checking for syscall(2) invocation method" >&5
 echo $ECHO_N "checking for syscall(2) invocation method... $ECHO_C" >&6
 
@@ -26349,9 +26761,9 @@ echo "$as_me: WARNING: ext2fs/ext2_fs.h: proceeding with the preprocessor's resu
 echo "$as_me: WARNING: ext2fs/ext2_fs.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------------------------ ##
-## Report this to enrico.scholz@informatik.tu-chemnitz.de ##
-## ------------------------------------------------------ ##
+## --------------------------------------------- ##
+## Report this to vserver@list.linux-vserver.org ##
+## --------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -26503,9 +26915,9 @@ echo "$as_me: WARNING: linux/ext2_fs.h: proceeding with the preprocessor's resul
 echo "$as_me: WARNING: linux/ext2_fs.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------------------------ ##
-## Report this to enrico.scholz@informatik.tu-chemnitz.de ##
-## ------------------------------------------------------ ##
+## --------------------------------------------- ##
+## Report this to vserver@list.linux-vserver.org ##
+## --------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -26548,7 +26960,7 @@ the following reasons:
 * kernel headers are broken (e.g. these of linux 2.6 are known to be)
   and you do not have e2fsprogs headers installed; please try to install
   - e2fsprogs-devel (for Red Hat), or
-  - libext2fs2-devel (for Mandrake), or
+  - lib*ext2fs2-devel (for Mandriva), or
   - e2fslibs-dev (for Debian)
   in this case.
 
@@ -26576,7 +26988,7 @@ the following reasons:
 * kernel headers are broken (e.g. these of linux 2.6 are known to be)
   and you do not have e2fsprogs headers installed; please try to install
   - e2fsprogs-devel (for Red Hat), or
-  - libext2fs2-devel (for Mandrake), or
+  - lib*ext2fs2-devel (for Mandriva), or
   - e2fslibs-dev (for Debian)
   in this case.
 
@@ -27035,9 +27447,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------------------------ ##
-## Report this to enrico.scholz@informatik.tu-chemnitz.de ##
-## ------------------------------------------------------ ##
+## --------------------------------------------- ##
+## Report this to vserver@list.linux-vserver.org ##
+## --------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
 done
 
 
+if test x"$ensc_have_dietlibc" = xno; then
+       echo "$as_me:$LINENO: checking for openpty" >&5
+echo $ECHO_N "checking for openpty... $ECHO_C" >&6
+if test "${ac_cv_func_openpty+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define openpty to an innocuous variant, in case <limits.h> declares openpty.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define openpty innocuous_openpty
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char openpty (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef openpty
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char openpty ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_openpty) || defined (__stub___openpty)
+choke me
+#else
+char (*f) () = openpty;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != openpty;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_openpty=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_openpty=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_openpty" >&5
+echo "${ECHO_T}$ac_cv_func_openpty" >&6
+if test $ac_cv_func_openpty = yes; then
+  :
+else
+
+echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
+echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+if test "${ac_cv_lib_util_openpty+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lutil  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char openpty ();
+int
+main ()
+{
+openpty ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_util_openpty=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_util_openpty=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_util_openpty" >&5
+echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+if test $ac_cv_lib_util_openpty = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUTIL 1
+_ACEOF
+
+  LIBS="-lutil $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error:
+****
+**** openpty could not be found
+****" >&5
+echo "$as_me: error:
+****
+**** openpty could not be found
+****" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+
+fi
+
 
 if test x"$ensc_cv_c99_c99compiler" = xyes; then
        ensc_have_beecrypt=yes
@@ -27187,9 +27781,9 @@ echo "$as_me: WARNING: beecrypt/beecrypt.h: proceeding with the preprocessor's r
 echo "$as_me: WARNING: beecrypt/beecrypt.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------------------------ ##
-## Report this to enrico.scholz@informatik.tu-chemnitz.de ##
-## ------------------------------------------------------ ##
+## --------------------------------------------- ##
+## Report this to vserver@list.linux-vserver.org ##
+## --------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -27573,17 +28167,10 @@ echo "$as_me: error: conditional \"ENSC_USE_GLIBC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${HAVE_CVS2CL_TRUE}" && test -z "${HAVE_CVS2CL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_CVS2CL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_CVS2CL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${HAVE_RCS2LOG_TRUE}" && test -z "${HAVE_RCS2LOG_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_RCS2LOG\" was never defined.
+if test -z "${HAVE_SVN2CL_TRUE}" && test -z "${HAVE_SVN2CL_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_SVN2CL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_RCS2LOG\" was never defined.
+echo "$as_me: error: conditional \"HAVE_SVN2CL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -27631,7 +28218,6 @@ Paths:
             cfg-Directory: $sysconfdir/vservers
          initrd-Directory: $initrddir
        pkgstate-Directory: $localstatedir/run/vservers
-            Kernelheaders: $kernelincludedir
           vserver-Rootdir: $vserverdir
 "
                        echo "$FEATURES_TXT" >FEATURES.txt
@@ -27907,7 +28493,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by util-vserver $as_me 0.30.208, which was
+This file was extended by util-vserver $as_me 0.30.212, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27970,7 +28556,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-util-vserver config.status 0.30.208
+util-vserver config.status 0.30.212
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -28274,6 +28860,12 @@ s,@NOHUP@,$NOHUP,;t t
 s,@RMMOD@,$RMMOD,;t t
 s,@VCONFIG@,$VCONFIG,;t t
 s,@WGET@,$WGET,;t t
+s,@FILE@,$FILE,;t t
+s,@GZIP@,$GZIP,;t t
+s,@BZIP2@,$BZIP2,;t t
+s,@CPIO@,$CPIO,;t t
+s,@RESTORE@,$RESTORE,;t t
+s,@RSYNC@,$RSYNC,;t t
 s,@DOXYGEN@,$DOXYGEN,;t t
 s,@XSLTP@,$XSLTP,;t t
 s,@XSLTPROC@,$XSLTPROC,;t t
@@ -28306,15 +28898,10 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@kernelincludedir@,$kernelincludedir,;t t
 s,@vserverdir@,$vserverdir,;t t
-s,@CVS2CL_TAG@,$CVS2CL_TAG,;t t
-s,@CVS2CL@,$CVS2CL,;t t
-s,@HAVE_CVS2CL_TRUE@,$HAVE_CVS2CL_TRUE,;t t
-s,@HAVE_CVS2CL_FALSE@,$HAVE_CVS2CL_FALSE,;t t
-s,@RCS2LOG@,$RCS2LOG,;t t
-s,@HAVE_RCS2LOG_TRUE@,$HAVE_RCS2LOG_TRUE,;t t
-s,@HAVE_RCS2LOG_FALSE@,$HAVE_RCS2LOG_FALSE,;t t
+s,@SVN2CL@,$SVN2CL,;t t
+s,@HAVE_SVN2CL_TRUE@,$HAVE_SVN2CL_TRUE,;t t
+s,@HAVE_SVN2CL_FALSE@,$HAVE_SVN2CL_FALSE,;t t
 s,@ENSC_ENABLE_INTERNAL_HEADERS_TRUE@,$ENSC_ENABLE_INTERNAL_HEADERS_TRUE,;t t
 s,@ENSC_ENABLE_INTERNAL_HEADERS_FALSE@,$ENSC_ENABLE_INTERNAL_HEADERS_FALSE,;t t
 s,@ENSC_HAVE_BEECRYPT_TRUE@,$ENSC_HAVE_BEECRYPT_TRUE,;t t
index b5c0f5e..575d024 100644 (file)
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.97 2005/07/15 20:25:06 ensc Exp $
+dnl $Id: configure.ac 2422 2006-12-09 16:13:54Z dhozac $
 
 dnl Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 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.208, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.30.212, vserver@list.linux-vserver.org)
 AC_CONFIG_SRCDIR([src/capchroot.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -57,6 +57,12 @@ ENSC_PATHPROG(NOHUP,     nohup)
 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(DOXYGEN,   doxygen,  [:])
 ENSC_PATHPROG(XSLTP,     xsltp,    [:])
@@ -65,7 +71,10 @@ ENSC_PATHPROG(XSLTPROC,  xsltproc, [:])
 
 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])
@@ -110,13 +119,13 @@ fi
 
 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")
@@ -137,6 +146,7 @@ dnl
 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;;
        (*)             min_diet_ver=0.28;;
 esac
 
@@ -174,9 +184,8 @@ dnl
 dnl ##########################
 
 
-ENSC_KERNEL_HEADERS(kernelincludedir)
 ENSC_UV_VROOTDIR(vserverdir)
-ENSC_CHANGELOG([trunk])
+ENSC_CHANGELOG
 
 
 dnl ##########################
@@ -204,46 +213,64 @@ 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_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, ALL,NOLEGACY (default: v13,net,v21)])],
               [],
-             [enable_apis=compat,v11,v13,fscompat,net])
+             [enable_apis=v13,net,v21])
 
-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'
+test x"$enable_apis" != xNOLEGACY || enable_apis='compat,v11,fscompat,v13,net,v21'
 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);;
+               (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
@@ -252,7 +279,7 @@ dnl
 dnl ##########################
 
 
-ENSC_SYSCALLNR(vserver,273)
+ENSC_SYSCALLNR(vserver,273,[lib/syscall-fallback.h])
 ENSC_SYSCALL
 ENSC_CHECK_EXT2FS_HEADER
 AC_CHECK_FUNCS([vserver])
@@ -262,6 +289,14 @@ AC_CHECK_TYPES(nid_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
@@ -348,7 +383,6 @@ Paths:
             cfg-Directory: $sysconfdir/vservers
          initrd-Directory: $initrddir
        pkgstate-Directory: $localstatedir/run/vservers
-            Kernelheaders: $kernelincludedir
           vserver-Rootdir: $vserverdir
 "
                        echo "$FEATURES_TXT" >FEATURES.txt
index 6cad263..f129cb9 100644 (file)
@@ -5,19 +5,24 @@ base   @PKGLIBDIR@/functions
 build  @PKGLIBDIR@/vserver-build.apt-rpm
 build  @PKGLIBDIR@/vserver-build.skeleton
 build  @PKGLIBDIR@/vserver-build.debootstrap
+build  @PKGLIBDIR@/vserver-build.fai
 build  @PKGLIBDIR@/vserver-build.yum
 build  @PKGLIBDIR@/vserver-build.rpm
+build  @PKGLIBDIR@/vserver-build.template
+build  @PKGLIBDIR@/vserver-build.rsync
 build  @PKGLIBDIR@/vserver-build.functions
 build  @PKGLIBDIR@/vserver-build.functions.apt
 build  @PKGLIBDIR@/vserver-build.functions.rpm
 build  @PKGLIBDIR@/vserver-build.functions.yum
 build  @PKGLIBDIR@/vserver-build.functions.pkgmgmt
 build  @PKGLIBDIR@/vserver-setup.functions
+build  @PKGLIBDIR@/magic.mime
 base   @PKGLIBDIR@/vserver.functions
 base   @PKGLIBDIR@/vserver.start
 @ENSC_HAVE_C99_COMPILER_TRUE@base   @PKGLIBDIR@/vserver.start.bin
 base   @PKGLIBDIR@/vserver.stop
 base   @PKGLIBDIR@/vserver.suexec
+base   @PKGLIBDIR@/vserver.delete
 core   @PKGLIBDIR@/util-vserver-vars
 build  @PKGLIBDIR@/rpm-fake.so
 legacy @LEGACYDIR@/save_s_context
@@ -35,12 +40,14 @@ legacy @LEGACYDIR@/vreboot
 core   @PKGLIBDIR@/FEATURES.txt
 base   @PKGLIBDIR@/defaults/mtab
 base   @PKGLIBDIR@/defaults