regenerated

diff --git a/Makefile.in b/Makefile.in
index db5ad24..0a4fecd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ sysv_GENSCRPTS = sysv/rebootmgr \
                           sysv/vservers
 
 sysv_SCRPTS = $(sysv_GENSCRPTS)
-sysv_CFG = sysv/vservers.conf
+sysv_CFG = sysv/vservers.conf sysv/vcached.conf
 linuxconf_gen_SCRPTS = linuxconf/newvserver
 linuxconf_src_DATMAN = linuxconf/newvserver.8
 linuxconf_cfg_src_DTA = linuxconf/newvserver.defaults
@@ -2166,6 +2166,11 @@ linuxvirtual.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' '$@'
 
+install-exec-hook:
+       cd $(DESTDIR)$(sbindir) && $(LN_S) vuseradd vadduser
+       cd $(DESTDIR)$(sbindir) && $(LN_S) vuserdel vdeluser
+       cd $(DESTDIR)$(sysvdir) && $(LN_S) vservers vserver-init
+
 #install-data-hook:            $(DESTDIR)$(pkglibdir)/setattr
 
 #$(DESTDIR)$(pkglibdir)/setattr:
@@ -2185,10 +2190,6 @@ scripts/%:               scripts/%.subst
                        mv '$@.tmp' '$@'
                        @chmod a-w '$@'
 
-install-exec-hook:
-       cd $(DESTDIR)$(sbindir) && $(LN_S) vuseradd vadduser
-       cd $(DESTDIR)$(sbindir) && $(LN_S) vuserdel vdeluser
-
 sysv/%:                        sysv/%.subst
                        @mkdir -p $$(dirname '$@')
                        sed -e 's!/usr/lib/util-vserver!$(pkglibdir)!g; \

diff --git a/aclocal.m4 b/aclocal.m4
index c34e705..928b11c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -5965,7 +5965,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.8.4])])
+        [AM_AUTOMAKE_VERSION([1.8.3])])
 
 # AM_AUX_DIR_EXPAND
 
@@ -6191,14 +6191,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
         am_cv_$1_dependencies_compiler_type=$depmode
         break
       fi